diff --git a/terraform-apply/action.yml b/terraform-apply/action.yml
index 3776737..8d76de9 100644
--- a/terraform-apply/action.yml
+++ b/terraform-apply/action.yml
@@ -61,7 +61,7 @@ runs:
         TF_DIR: ${{ inputs.terraform-dir }}
         TF_WORKSPACE_NAME: ${{ inputs.workspace }}
       run: |
-        terraform -chdir="$TF_DIR" workspace select "$TF_WORKSPACE_NAME"
+        terraform -chdir="$TF_DIR" workspace select -or-create "$TF_WORKSPACE_NAME"
 
     - name: Terraform Apply
       shell: bash
diff --git a/terraform-validate/action.yml b/terraform-validate/action.yml
index 0fcde1f..b4389db 100644
--- a/terraform-validate/action.yml
+++ b/terraform-validate/action.yml
@@ -69,6 +69,15 @@ runs:
         TF_TOKEN_schmalz_jfrog_io: ${{ inputs.jfrog-token }}
       run: terraform -chdir=${{ env.TF_DIR }} init -backend=false -no-color
 
+    - name: Terraform Select Workspace
+      if: ${{ inputs.workspace != '' }}
+      shell: bash
+      env:
+        TF_DIR: ${{ inputs.terraform-dir }}
+        TF_WORKSPACE_NAME: ${{ inputs.workspace }}
+      run: |
+        terraform -chdir="$TF_DIR" workspace select -or-create "$TF_WORKSPACE_NAME"
+
     - name: Terraform Format Check
       shell: bash
       env: