diff --git a/.drone.yml b/.drone.yml
index 8a44bc8e373e0..38a1a64e69d4b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5622,9 +5622,8 @@ steps:
   - 'go run ./cmd/gh-trigger-workflow -owner ${DRONE_REPO_OWNER} -repo teleport.e
     -tag-workflow -series-run -series-run-filter .*apt.* -timeout 12h0m0s -workflow
     deploy-packages.yaml -workflow-ref=refs/heads/master -input "artifact-tag=${DRONE_TAG}"
-    -input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-name-filter=$($DRONE_REPO_PRIVATE
-    && echo "*ent*" || echo "")" -input "package-to-test=teleport-ent" -input "release-channel=stable"
-    -input "repo-type=apt" -input "version-channel=${DRONE_TAG}" '
+    -input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-to-test=teleport-ent"
+    -input "release-channel=stable" -input "repo-type=apt" -input "version-channel=${DRONE_TAG}" '
   environment:
     GHA_APP_KEY:
       from_secret: GITHUB_WORKFLOW_APP_PRIVATE_KEY
@@ -5644,9 +5643,8 @@ steps:
   - 'go run ./cmd/gh-trigger-workflow -owner ${DRONE_REPO_OWNER} -repo teleport.e
     -tag-workflow -series-run -series-run-filter .*yum.* -timeout 12h0m0s -workflow
     deploy-packages.yaml -workflow-ref=refs/heads/master -input "artifact-tag=${DRONE_TAG}"
-    -input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-name-filter=$($DRONE_REPO_PRIVATE
-    && echo "*ent*" || echo "")" -input "package-to-test=teleport-ent" -input "release-channel=stable"
-    -input "repo-type=yum" -input "version-channel=${DRONE_TAG}" '
+    -input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-to-test=teleport-ent"
+    -input "release-channel=stable" -input "repo-type=yum" -input "version-channel=${DRONE_TAG}" '
   environment:
     GHA_APP_KEY:
       from_secret: GITHUB_WORKFLOW_APP_PRIVATE_KEY
@@ -5708,9 +5706,8 @@ steps:
   - 'go run ./cmd/gh-trigger-workflow -owner ${DRONE_REPO_OWNER} -repo teleport.e
     -tag-workflow -series-run -series-run-filter .*apt.* -timeout 12h0m0s -workflow
     deploy-packages.yaml -workflow-ref=refs/heads/master -input "artifact-tag=${DRONE_TAG}"
-    -input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-name-filter=$($DRONE_REPO_PRIVATE
-    && echo "*ent*" || echo "")" -input "package-to-test=teleport-ent" -input "release-channel=stable"
-    -input "repo-type=apt" -input "version-channel=rolling" '
+    -input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-to-test=teleport-ent"
+    -input "release-channel=stable" -input "repo-type=apt" -input "version-channel=rolling" '
   environment:
     GHA_APP_KEY:
       from_secret: GITHUB_WORKFLOW_APP_PRIVATE_KEY
@@ -5730,9 +5727,8 @@ steps:
   - 'go run ./cmd/gh-trigger-workflow -owner ${DRONE_REPO_OWNER} -repo teleport.e
     -tag-workflow -series-run -series-run-filter .*yum.* -timeout 12h0m0s -workflow
     deploy-packages.yaml -workflow-ref=refs/heads/master -input "artifact-tag=${DRONE_TAG}"
-    -input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-name-filter=$($DRONE_REPO_PRIVATE
-    && echo "*ent*" || echo "")" -input "package-to-test=teleport-ent" -input "release-channel=stable"
-    -input "repo-type=yum" -input "version-channel=rolling" '
+    -input "environment=$(cat "/go/vars/release-environment.txt")" -input "package-to-test=teleport-ent"
+    -input "release-channel=stable" -input "repo-type=yum" -input "version-channel=rolling" '
   environment:
     GHA_APP_KEY:
       from_secret: GITHUB_WORKFLOW_APP_PRIVATE_KEY
@@ -16622,6 +16618,6 @@ image_pull_secrets:
 - DOCKERHUB_CREDENTIALS
 ---
 kind: signature
-hmac: d34cacc9bae89579ff6fc90d253c055187925256fc8e775619eed5578bce0cc1
+hmac: d977718f9549867d95e28794270a20aaa482a028734017780d76e763c1865963
 
 ...
diff --git a/dronegen/os_repos.go b/dronegen/os_repos.go
index f9da8c7bc920a..66b0404f0ec96 100644
--- a/dronegen/os_repos.go
+++ b/dronegen/os_repos.go
@@ -31,10 +31,9 @@ func promoteBuildOsRepoPipeline() pipeline {
 	packageDeployments := []osPackageDeployment{
 		// Normal release pipelines
 		{
-			versionChannel:    "${DRONE_TAG}",
-			packageNameFilter: `$($DRONE_REPO_PRIVATE && echo "*ent*" || echo "")`,
-			packageToTest:     "teleport-ent",
-			displayName:       "Teleport",
+			versionChannel: "${DRONE_TAG}",
+			packageToTest:  "teleport-ent",
+			displayName:    "Teleport",
 		},
 		// teleport-ent-updater to stable/cloud only pipelines
 		{
@@ -44,10 +43,9 @@ func promoteBuildOsRepoPipeline() pipeline {
 		},
 		// Rolling release pipelines
 		{
-			versionChannel:    "rolling",
-			packageNameFilter: `$($DRONE_REPO_PRIVATE && echo "*ent*" || echo "")`,
-			packageToTest:     "teleport-ent",
-			displayName:       "Teleport",
+			versionChannel: "rolling",
+			packageToTest:  "teleport-ent",
+			displayName:    "Teleport",
 		},
 	}
 
@@ -86,12 +84,15 @@ func buildWorkflows(releaseEnvironmentFilePath string, packageDeployments []osPa
 	for _, packageDeployment := range packageDeployments {
 		for _, repoType := range repoTypes {
 			inputs := map[string]string{
-				"repo-type":           repoType,
-				"environment":         fmt.Sprintf("$(cat %q)", releaseEnvironmentFilePath),
-				"artifact-tag":        "${DRONE_TAG}",
-				"release-channel":     "stable",
-				"version-channel":     packageDeployment.versionChannel,
-				"package-name-filter": packageDeployment.packageNameFilter,
+				"repo-type":       repoType,
+				"environment":     fmt.Sprintf("$(cat %q)", releaseEnvironmentFilePath),
+				"artifact-tag":    "${DRONE_TAG}",
+				"release-channel": "stable",
+				"version-channel": packageDeployment.versionChannel,
+			}
+
+			if packageDeployment.packageNameFilter != "" {
+				inputs["package-name-filter"] = packageDeployment.packageNameFilter
 			}
 
 			if packageDeployment.packageToTest != "" {