diff --git a/e2e/README.md b/e2e/README.md
index d510802ca2..f8cd71ede1 100644
--- a/e2e/README.md
+++ b/e2e/README.md
@@ -34,7 +34,7 @@ To add a new test that you've already added in the [kots-tests-app repo](https:/
 ```go
 func NewChangeChannel() Test {
 	return Test{
-		ID:          "change-channel",
+		ID:          "@change-channel",
 		Name:        "Change Channel",
 		Namespace:   "change-channel",
 		AppSlug:     "change-channel",
@@ -52,8 +52,8 @@ Entry(nil, inventory.NewChangeChannel()),
 - Create a new test directory in `e2e/playwright/tests` matching your test ID, with the corresponding test file:
 
 ```
-$ tree e2e/playwright/tests/change-channel
-e2e/playwright/tests/change-channel 
+$ tree e2e/playwright/tests/@change-channel
+e2e/playwright/tests/@change-channel 
 ├── license.yaml  // a test specific license if needed
 └── test.spec.ts  // the actual test file
 ```
diff --git a/e2e/inventory/inventory.go b/e2e/inventory/inventory.go
index 0180f067b9..ff96200266 100644
--- a/e2e/inventory/inventory.go
+++ b/e2e/inventory/inventory.go
@@ -35,7 +35,7 @@ func NewRegressionTest() Test {
 
 func NewSmokeTest() Test {
 	return Test{
-		ID:             "smoke-test",
+		ID:             "@smoke-test",
 		Name:           "Smoke Test",
 		Namespace:      "smoke-test",
 		AppSlug:        "qakotstestim",
@@ -55,7 +55,7 @@ func NewAirgapSmokeTest() Test {
 
 func NewConfigValidation() Test {
 	return Test{
-		ID:          "config-validation",
+		ID:          "@config-validation",
 		Name:        "Config Validation",
 		Namespace:   "config-validation",
 		AppSlug:     "config-validation-panda",
@@ -65,7 +65,7 @@ func NewConfigValidation() Test {
 
 func NewBackupAndRestore() Test {
 	return Test{
-		ID:             "backup-and-restore",
+		ID:             "@backup-and-restore",
 		Name:           "Backup and Restore",
 		Namespace:      "backup-and-restore",
 		AppSlug:        "backup-and-restore",
@@ -76,7 +76,7 @@ func NewBackupAndRestore() Test {
 
 func NewNoRequiredConfig() Test {
 	return Test{
-		ID:          "no-required-config",
+		ID:          "@no-required-config",
 		Name:        "No Required Config",
 		Namespace:   "no-required-config",
 		AppSlug:     "no-required-config",
@@ -104,7 +104,7 @@ func NewChangeLicense() Test {
 
 func NewMultiAppBackupAndRestoreTest() Test {
 	return Test{
-		ID:             "multi-app-backup-and-restore",
+		ID:             "@multi-app-backup-and-restore",
 		Name:           "Multi App Backup and Restore",
 		Namespace:      "multi-app-backup-and-restore",
 		AppSlug:        "multi-app-backup-and-restore",
@@ -115,7 +115,7 @@ func NewMultiAppBackupAndRestoreTest() Test {
 
 func MultiAppTest() Test {
 	return Test{
-		ID:          "multi-app-install",
+		ID:          "@multi-app-install",
 		Name:        "Multi App Install",
 		Namespace:   "multi-app-install",
 		AppSlug:     "mutli-app-install",
@@ -173,7 +173,7 @@ func NewGitOps() Test {
 
 func NewChangeChannel() Test {
 	return Test{
-		ID:          "change-channel",
+		ID:          "@change-channel",
 		Name:        "Change Channel",
 		Namespace:   "change-channel",
 		AppSlug:     "change-channel",
diff --git a/e2e/playwright/tests/backup-and-restore/license.yaml b/e2e/playwright/tests/@backup-and-restore/license.yaml
similarity index 100%
rename from e2e/playwright/tests/backup-and-restore/license.yaml
rename to e2e/playwright/tests/@backup-and-restore/license.yaml
diff --git a/e2e/playwright/tests/backup-and-restore/test.spec.ts b/e2e/playwright/tests/@backup-and-restore/test.spec.ts
similarity index 100%
rename from e2e/playwright/tests/backup-and-restore/test.spec.ts
rename to e2e/playwright/tests/@backup-and-restore/test.spec.ts
diff --git a/e2e/playwright/tests/change-channel/license.yaml b/e2e/playwright/tests/@change-channel/license.yaml
similarity index 100%
rename from e2e/playwright/tests/change-channel/license.yaml
rename to e2e/playwright/tests/@change-channel/license.yaml
diff --git a/e2e/playwright/tests/change-channel/test.spec.ts b/e2e/playwright/tests/@change-channel/test.spec.ts
similarity index 100%
rename from e2e/playwright/tests/change-channel/test.spec.ts
rename to e2e/playwright/tests/@change-channel/test.spec.ts
diff --git a/e2e/playwright/tests/config-validation/invalid-jwt.txt b/e2e/playwright/tests/@config-validation/invalid-jwt.txt
similarity index 100%
rename from e2e/playwright/tests/config-validation/invalid-jwt.txt
rename to e2e/playwright/tests/@config-validation/invalid-jwt.txt
diff --git a/e2e/playwright/tests/config-validation/license.yaml b/e2e/playwright/tests/@config-validation/license.yaml
similarity index 100%
rename from e2e/playwright/tests/config-validation/license.yaml
rename to e2e/playwright/tests/@config-validation/license.yaml
diff --git a/e2e/playwright/tests/config-validation/test.spec.ts b/e2e/playwright/tests/@config-validation/test.spec.ts
similarity index 100%
rename from e2e/playwright/tests/config-validation/test.spec.ts
rename to e2e/playwright/tests/@config-validation/test.spec.ts
diff --git a/e2e/playwright/tests/config-validation/valid-jwt.txt b/e2e/playwright/tests/@config-validation/valid-jwt.txt
similarity index 100%
rename from e2e/playwright/tests/config-validation/valid-jwt.txt
rename to e2e/playwright/tests/@config-validation/valid-jwt.txt
diff --git a/e2e/playwright/tests/multi-app-backup-and-restore/app1-license.yaml b/e2e/playwright/tests/@multi-app-backup-and-restore/app1-license.yaml
similarity index 100%
rename from e2e/playwright/tests/multi-app-backup-and-restore/app1-license.yaml
rename to e2e/playwright/tests/@multi-app-backup-and-restore/app1-license.yaml
diff --git a/e2e/playwright/tests/multi-app-backup-and-restore/app2-license.yaml b/e2e/playwright/tests/@multi-app-backup-and-restore/app2-license.yaml
similarity index 100%
rename from e2e/playwright/tests/multi-app-backup-and-restore/app2-license.yaml
rename to e2e/playwright/tests/@multi-app-backup-and-restore/app2-license.yaml
diff --git a/e2e/playwright/tests/multi-app-backup-and-restore/test.spec.ts b/e2e/playwright/tests/@multi-app-backup-and-restore/test.spec.ts
similarity index 100%
rename from e2e/playwright/tests/multi-app-backup-and-restore/test.spec.ts
rename to e2e/playwright/tests/@multi-app-backup-and-restore/test.spec.ts
diff --git a/e2e/playwright/tests/multi-app-install/app1-license.yaml b/e2e/playwright/tests/@multi-app-install/app1-license.yaml
similarity index 100%
rename from e2e/playwright/tests/multi-app-install/app1-license.yaml
rename to e2e/playwright/tests/@multi-app-install/app1-license.yaml
diff --git a/e2e/playwright/tests/multi-app-install/app2-license.yaml b/e2e/playwright/tests/@multi-app-install/app2-license.yaml
similarity index 100%
rename from e2e/playwright/tests/multi-app-install/app2-license.yaml
rename to e2e/playwright/tests/@multi-app-install/app2-license.yaml
diff --git a/e2e/playwright/tests/multi-app-install/test.spec.ts b/e2e/playwright/tests/@multi-app-install/test.spec.ts
similarity index 100%
rename from e2e/playwright/tests/multi-app-install/test.spec.ts
rename to e2e/playwright/tests/@multi-app-install/test.spec.ts
diff --git a/e2e/playwright/tests/no-required-config/license.yaml b/e2e/playwright/tests/@no-required-config/license.yaml
similarity index 100%
rename from e2e/playwright/tests/no-required-config/license.yaml
rename to e2e/playwright/tests/@no-required-config/license.yaml
diff --git a/e2e/playwright/tests/no-required-config/test.spec.ts b/e2e/playwright/tests/@no-required-config/test.spec.ts
similarity index 100%
rename from e2e/playwright/tests/no-required-config/test.spec.ts
rename to e2e/playwright/tests/@no-required-config/test.spec.ts
diff --git a/e2e/playwright/tests/smoke-test/license.yaml b/e2e/playwright/tests/@smoke-test/license.yaml
similarity index 100%
rename from e2e/playwright/tests/smoke-test/license.yaml
rename to e2e/playwright/tests/@smoke-test/license.yaml
diff --git a/e2e/playwright/tests/smoke-test/test.spec.ts b/e2e/playwright/tests/@smoke-test/test.spec.ts
similarity index 100%
rename from e2e/playwright/tests/smoke-test/test.spec.ts
rename to e2e/playwright/tests/@smoke-test/test.spec.ts
diff --git a/kurl_proxy/Makefile b/kurl_proxy/Makefile
index 9fac8b1cf7..d79947a014 100644
--- a/kurl_proxy/Makefile
+++ b/kurl_proxy/Makefile
@@ -18,5 +18,5 @@ run:
 build-ttl.sh: export GOOS ?= linux
 build-ttl.sh: export GOARCH ?= amd64
 build-ttl.sh: build
-	docker build --platform $(GOOS)/$(GOARCH) --pull -f dev/Dockerfile.ttlsh -t ttl.sh/${CURRENT_USER}/kurl-proxy:24h .
+	docker build --platform $(GOOS)/$(GOARCH) --pull -f ../dev/dockerfiles/kurl-proxy/Dockerfile.ttlsh -t ttl.sh/${CURRENT_USER}/kurl-proxy:24h .
 	docker push ttl.sh/${CURRENT_USER}/kurl-proxy:24h