diff --git a/.github/workflows/docker-openmetadata-airflow.yml b/.github/workflows/docker-openmetadata-airflow.yml
index 9f4be0f05ff..0dc10b49cfb 100644
--- a/.github/workflows/docker-openmetadata-airflow.yml
+++ b/.github/workflows/docker-openmetadata-airflow.yml
@@ -52,5 +52,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name == 'release' }}
           # Update tags before every release
-          tags: 'openmetadata/airflow:$input,openmetadata/airflow:latest'
+          tags: 'openmetadata/airflow:${{ env.input }},openmetadata/airflow:latest'
           file: ./docker/airflow/Dockerfile
diff --git a/.github/workflows/docker-openmetadata-db.yml b/.github/workflows/docker-openmetadata-db.yml
index 1b56f702bc5..da2acea0aca 100644
--- a/.github/workflows/docker-openmetadata-db.yml
+++ b/.github/workflows/docker-openmetadata-db.yml
@@ -52,5 +52,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name == 'release' }}
           # Update tags before every release
-          tags: 'openmetadata/db:$input,openmetadata/db:latest'
+          tags: 'openmetadata/db:${{ env.input }},openmetadata/db:latest'
           file: ./docker/local-metadata/Dockerfile_mysql
diff --git a/.github/workflows/docker-openmetadata-ingestion.yml b/.github/workflows/docker-openmetadata-ingestion.yml
index 27607b8ff4c..18e10968d1d 100644
--- a/.github/workflows/docker-openmetadata-ingestion.yml
+++ b/.github/workflows/docker-openmetadata-ingestion.yml
@@ -62,5 +62,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name == 'release' }}
           # Update tags before every release
-          tags: 'openmetadata/ingestion:$input,openmetadata/ingestion:latest'
+          tags: 'openmetadata/ingestion:${{ env.input }},openmetadata/ingestion:latest'
           file: ./ingestion/Dockerfile
diff --git a/.github/workflows/docker-openmetadata-server.yml b/.github/workflows/docker-openmetadata-server.yml
index 85299f616c7..49104a4dd48 100644
--- a/.github/workflows/docker-openmetadata-server.yml
+++ b/.github/workflows/docker-openmetadata-server.yml
@@ -52,5 +52,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name == 'release' }}
           # Update tags before every release
-          tags: 'openmetadata/server:$input,openmetadata/server:latest'
+          tags: 'openmetadata/server:${{ env.input }},openmetadata/server:latest'
           file: ./docker/metadata/Dockerfile
diff --git a/.github/workflows/openmetadata-airflow-apis.yml b/.github/workflows/openmetadata-airflow-apis.yml
index 95e5a3120ef..f7c42d58d51 100644
--- a/.github/workflows/openmetadata-airflow-apis.yml
+++ b/.github/workflows/openmetadata-airflow-apis.yml
@@ -52,8 +52,8 @@ jobs:
           sudo apt-get install -y libsasl2-dev unixodbc-dev python3-venv
       - name: Install and Publish PyPi packages
         env:
-          TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+          TWINE_USERNAME: ${{ secrets.TWINE_OPENMETADATA_AIRFLOW_MANAGED_APIS_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.TWINE_OPENMETADATA_AIRFLOW_MANAGED_APIS_PASSWORD }}
         run: |
           make install_dev install_apis
           cd openmetadata-airflow-apis; \
diff --git a/.github/workflows/py-ingestion-publish.yml b/.github/workflows/py-ingestion-publish.yml
index 1d7f4d06fde..31857ce08a5 100644
--- a/.github/workflows/py-ingestion-publish.yml
+++ b/.github/workflows/py-ingestion-publish.yml
@@ -52,8 +52,8 @@ jobs:
           sudo apt-get install -y libsasl2-dev unixodbc-dev python3-venv
       - name: Install and Publish PyPi packages
         env:
-          TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+          TWINE_USERNAME: ${{ secrets.TWINE_OPENMETADATA_INGESTION_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.TWINE_OPENMETADATA_INGESTION_PASSWORD }}
         run: |
           make install_dev install
           cd ingestion; \