diff --git a/.github/workflows/anubis-eval-ci.yaml b/.github/workflows/anubis-eval-ci.yaml
index 47abe93..62d0031 100644
--- a/.github/workflows/anubis-eval-ci.yaml
+++ b/.github/workflows/anubis-eval-ci.yaml
@@ -5,12 +5,6 @@ on:
     tags:
       - "anubis/**"
 
-env:
-  NAMESPACE: pantheonix
-  REPOSITORY: anubis
-  IMAGE_NAME: anubis-eval
-  BUILD_CONTEXT: anubis-eval
-
 jobs:
   build:
     name: Build and Test Anubis Eval Microservice
@@ -50,13 +44,13 @@ jobs:
     needs: build
     uses: ./.github/workflows/step-deploy-to-ghcr.yaml
     with:
-      image_name: ${{ env.IMAGE_NAME }}
-      build_context: ${{ env.BUILD_CONTEXT }}
+      image_name: anubis-eval
+      build_context: anubis-eval
 
   deploy-to-docker-hub:
     needs: build
     uses: ./.github/workflows/step-deploy-to-docker-hub.yaml
     with:
-      namespace: ${{ env.NAMESPACE }}
-      repository: ${{ env.REPOSITORY }}
-      build_context: ${{ env.BUILD_CONTEXT }}
+      namespace: pantheonix
+      repository: anubis
+      build_context: anubis-eval
diff --git a/.github/workflows/dapr-config-ci.yaml b/.github/workflows/dapr-config-ci.yaml
index a407702..a0dfac4 100644
--- a/.github/workflows/dapr-config-ci.yaml
+++ b/.github/workflows/dapr-config-ci.yaml
@@ -5,22 +5,16 @@ on:
     tags:
       - "dapr/**"
 
-env:
-  NAMESPACE: pantheonix
-  REPOSITORY: asgard-dapr
-  IMAGE_NAME: asgard-dapr-config
-  BUILD_CONTEXT: dapr
-
 jobs:
   deploy-to-ghcr:
     uses: ./.github/workflows/step-deploy-to-ghcr.yaml
     with:
-      image_name: ${{ env.IMAGE_NAME }}
-      build_context: ${{ env.BUILD_CONTEXT }}
+      image_name: asgard-dapr-config
+      build_context: dapr
 
   deploy-to-docker-hub:
     uses: ./.github/workflows/step-deploy-to-docker-hub.yaml
     with:
-      namespace: ${{ env.NAMESPACE }}
-      repository: ${{ env.REPOSITORY }}
-      build_context: ${{ env.BUILD_CONTEXT }}
\ No newline at end of file
+      namespace: pantheonix
+      repository: asgard-dapr
+      build_context: dapr
\ No newline at end of file
diff --git a/.github/workflows/enki-problems-ci.yaml b/.github/workflows/enki-problems-ci.yaml
index c6d40fc..ff6d4bb 100644
--- a/.github/workflows/enki-problems-ci.yaml
+++ b/.github/workflows/enki-problems-ci.yaml
@@ -5,12 +5,6 @@ on:
     tags:
       - "enki/**"
 
-env:
-  NAMESPACE: pantheonix
-  REPOSITORY: enki
-  IMAGE_NAME: enki-problems
-  BUILD_CONTEXT: enki-problems
-
 jobs:
   build:
     name: Build and Test Enki Problems Microservice
@@ -37,13 +31,13 @@ jobs:
     needs: build
     uses: ./.github/workflows/step-deploy-to-ghcr.yaml
     with:
-      image_name: ${{ env.IMAGE_NAME }}
-      build_context: ${{ env.BUILD_CONTEXT }}
+      image_name: enki-problems
+      build_context: enki-problems
 
   deploy-to-docker-hub:
     needs: build
     uses: ./.github/workflows/step-deploy-to-docker-hub.yaml
     with:
-      namespace: ${{ env.NAMESPACE }}
-      repository: ${{ env.REPOSITORY }}
-      build_context: ${{ env.BUILD_CONTEXT }}
+      namespace: pantheonix
+      repository: enki
+      build_context: enki-problems
diff --git a/.github/workflows/eval-lb-ci.yaml b/.github/workflows/eval-lb-ci.yaml
index 82044d3..ef104f1 100644
--- a/.github/workflows/eval-lb-ci.yaml
+++ b/.github/workflows/eval-lb-ci.yaml
@@ -5,22 +5,16 @@ on:
     tags:
       - "eval-lb/**"
 
-env:
-  NAMESPACE: pantheonix
-  REPOSITORY: eval-lb
-  IMAGE_NAME: asgard-eval-lb
-  BUILD_CONTEXT: anubis-eval/eval-lb
-
 jobs:
   deploy-to-ghcr:
     uses: ./.github/workflows/step-deploy-to-ghcr.yaml
     with:
-      image_name: ${{ env.IMAGE_NAME }}
-      build_context: ${{ env.BUILD_CONTEXT }}
+      image_name: asgard-eval-lb
+      build_context: anubis-eval/eval-lb
 
   deploy-to-docker-hub:
     uses: ./.github/workflows/step-deploy-to-docker-hub.yaml
     with:
-      namespace: ${{ env.NAMESPACE }}
-      repository: ${{ env.REPOSITORY }}
-      build_context: ${{ env.BUILD_CONTEXT }}
+      namespace: pantheonix
+      repository: eval-lb
+      build_context: anubis-eval/eval-lb
diff --git a/.github/workflows/hermes-tests-ci.yaml b/.github/workflows/hermes-tests-ci.yaml
index c4a59aa..53256cc 100644
--- a/.github/workflows/hermes-tests-ci.yaml
+++ b/.github/workflows/hermes-tests-ci.yaml
@@ -5,13 +5,6 @@ on:
     tags:
       - "hermes/**"
 
-env:
-  NAMESPACE: pantheonix
-  REPOSITORY: hermes
-  IMAGE_NAME: hermes-tests
-  BUILD_CONTEXT: hermes-tests
-  HERMES_CONFIG: ${{ secrets.HERMES_CONFIG }}
-
 jobs:
   build:
     name: Build and Test Hermes Tests Microservice
@@ -43,13 +36,13 @@ jobs:
     needs: build
     uses: ./.github/workflows/step-deploy-to-ghcr.yaml
     with:
-      image_name: ${{ env.IMAGE_NAME }}
-      build_context: ${{ env.BUILD_CONTEXT }}
+      image_name: hermes-tests
+      build_context: hermes-tests
 
   deploy-to-docker-hub:
     needs: build
     uses: ./.github/workflows/step-deploy-to-docker-hub.yaml
     with:
-      namespace: ${{ env.NAMESPACE }}
-      repository: ${{ env.REPOSITORY }}
-      build_context: ${{ env.BUILD_CONTEXT }}
+      namespace: pantheonix
+      repository: hermes
+      build_context: hermes-tests
diff --git a/.github/workflows/odin-gateway-ci.yaml b/.github/workflows/odin-gateway-ci.yaml
index b5e5484..40159a9 100644
--- a/.github/workflows/odin-gateway-ci.yaml
+++ b/.github/workflows/odin-gateway-ci.yaml
@@ -5,23 +5,17 @@ on:
     tags:
       - "odin/**"
 
-env:
-  NAMESPACE: pantheonix
-  REPOSITORY: odin
-  IMAGE_NAME: odin-api-gateway
-  BUILD_CONTEXT: odin-gateway
-
 jobs:
   deploy-to-ghcr:
     uses: ./.github/workflows/step-deploy-to-ghcr.yaml
     with:
-      image_name: ${{ env.IMAGE_NAME }}
-      build_context: ${{ env.BUILD_CONTEXT }}
+      image_name: odin-api-gateway
+      build_context: odin-gateway
 
   deploy-to-docker-hub:
     uses: ./.github/workflows/step-deploy-to-docker-hub.yaml
     with:
-      namespace: ${{ env.NAMESPACE }}
-      repository: ${{ env.REPOSITORY }}
-      build_context: ${{ env.BUILD_CONTEXT }}
+      namespace: pantheonix
+      repository: odin
+      build_context: odin-gateway
 
diff --git a/.github/workflows/quetzalcoatl-auth-ci.yaml b/.github/workflows/quetzalcoatl-auth-ci.yaml
index aba5d5d..f01a0df 100644
--- a/.github/workflows/quetzalcoatl-auth-ci.yaml
+++ b/.github/workflows/quetzalcoatl-auth-ci.yaml
@@ -5,12 +5,6 @@ on:
     tags:
       - "quetzalcoatl/**"
 
-env:
-  NAMESPACE: pantheonix
-  REPOSITORY: quetzalcoatl
-  IMAGE_NAME: quetzalcoatl-auth
-  BUILD_CONTEXT: quetzalcoatl-auth
-
 jobs:
   build:
     name: Build and Test Quetzalcoatl Auth Microservice
@@ -37,13 +31,13 @@ jobs:
     needs: build
     uses: ./.github/workflows/step-deploy-to-ghcr.yaml
     with:
-      image_name: ${{ env.IMAGE_NAME }}
-      build_context: ${{ env.BUILD_CONTEXT }}
+      image_name: quetzalcoatl-auth
+      build_context: quetzalcoatl-auth
 
   deploy-to-docker-hub:
     needs: build
     uses: ./.github/workflows/step-deploy-to-docker-hub.yaml
     with:
-      namespace: ${{ env.NAMESPACE }}
-      repository: ${{ env.REPOSITORY }}
-      build_context: ${{ env.BUILD_CONTEXT }}
+      namespace: pantheonix
+      repository: quetzalcoatl
+      build_context: quetzalcoatl-auth