diff --git a/.github/actions/acc_test/action.yaml b/.github/actions/acc_test/action.yaml
index 1d643ac6..3a88b209 100644
--- a/.github/actions/acc_test/action.yaml
+++ b/.github/actions/acc_test/action.yaml
@@ -2,6 +2,11 @@ name: Acceptance Testing
 description: "Acceptance Testing pipeline"
 
 inputs:
+  test_timeout_string:
+    description: "string that determines the timeout (default: 45m)"
+    default: '45m'
+    required: true
+
   go-version:
     description: "go version to install"
     default: '1.25'
@@ -115,11 +120,6 @@ runs:
         go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs@latest
         go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
 
-#    - name: Prepare pkg_gen directory
-#      shell: bash
-#      run: |
-#        go run generator/main.go build -p
-
     - name: Run go mod tidy
       shell: bash
       run: go mod tidy
@@ -190,7 +190,7 @@ runs:
         TF_ACC_KEK_KEY_RING_ID=${TF_ACC_KEK_KEY_RING_ID} \
         TF_ACC_KEK_KEY_VERSION=${TF_ACC_KEK_KEY_VERSION} \
         TF_ACC_KEK_SERVICE_ACCOUNT=${TF_ACC_KEK_SERVICE_ACCOUNT} \
-        go test ${{ inputs.test_file }} -count=1 -timeout=30m
+        go test ${{ inputs.test_file }} -count=1 -timeout=${{ inputs.test_timeout_string }}
       env:
         TF_ACC_PROJECT_ID: ${{ inputs.project_id }}
         TF_ACC_REGION: ${{ inputs.region }}
@@ -218,7 +218,7 @@ runs:
         TF_ACC_KEK_KEY_RING_ID=${TF_ACC_KEK_KEY_RING_ID} \
         TF_ACC_KEK_KEY_VERSION=${TF_ACC_KEK_KEY_VERSION} \
         TF_ACC_KEK_SERVICE_ACCOUNT=${TF_ACC_KEK_SERVICE_ACCOUNT} \
-        go test ./... -count=1 -timeout=30m
+        go test ./... -count=1 -timeout=${{ inputs.test_timeout_string }}
       env:
         TF_ACC_PROJECT_ID: ${{ inputs.project_id }}
         TF_ACC_REGION: ${{ inputs.region }}
diff --git a/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go b/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go
index 0b59be64..64b7e901 100644
--- a/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go
+++ b/stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go
@@ -297,9 +297,6 @@ func TestAccInstanceWithUsers(t *testing.T) {
 	data := getExample()
 
 	userName := "testUser"
-	if pID, ok := os.LookupEnv("TF_ACC_PROJECT_ID"); !ok || pID == "" {
-		t.Errorf("TF_ACC_PROJECT_ID is not set")
-	}
 	data.Users = []User{
 		{
 			Name:      userName,