diff --git a/.github/workflows/build_dev.yml b/.github/workflows/build_dev.yml
index 3dc9bce6..5a690d97 100644
--- a/.github/workflows/build_dev.yml
+++ b/.github/workflows/build_dev.yml
@@ -3,9 +3,9 @@ name: Build and push for dev
 env:
   MODULES_REGISTRY: ${{ vars.DEV_REGISTRY }}
   CI_COMMIT_REF_NAME: ${{ github.ref_name }}
-  MODULES_MODULE_NAME: ${{ vars.RENAMED_MODULE_NAME }}
+  MODULES_MODULE_NAME: ${{ vars.MODULE_NAME }}
   MODULES_MODULE_SOURCE: ${{ vars.DEV_MODULE_SOURCE }}
-  MODULES_REGISTRY_LOGIN: ${{ vars.RENAMED_DEV_MODULES_REGISTRY_LOGIN }}
+  MODULES_REGISTRY_LOGIN: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }}
   MODULES_REGISTRY_PASSWORD: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
 
 on:
diff --git a/.github/workflows/build_prod.yml b/.github/workflows/build_prod.yml
index 0e418924..827c38a1 100644
--- a/.github/workflows/build_prod.yml
+++ b/.github/workflows/build_prod.yml
@@ -3,9 +3,9 @@ name: Build and push for prod
 env:
   MODULES_REGISTRY: ${{ vars.PROD_REGISTRY }}
   CI_COMMIT_REF_NAME: ${{ github.ref_name }}
-  MODULES_MODULE_NAME: ${{ vars.RENAMED_MODULE_NAME }}
+  MODULES_MODULE_NAME: ${{ vars.MODULE_NAME }}
   MODULE_SOURCE_NAME: ${{ vars.PROD_MODULE_SOURCE_NAME }}
-  MODULES_REGISTRY_LOGIN: ${{ vars.RENAMED_PROD_MODULES_REGISTRY_LOGIN }}
+  MODULES_REGISTRY_LOGIN: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }}
   MODULES_REGISTRY_PASSWORD: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
   MODULES_MODULE_TAG: ${{ github.ref_name }}
 
diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml
index f3ffb6c5..ba1a5bde 100644
--- a/.github/workflows/deploy_dev.yml
+++ b/.github/workflows/deploy_dev.yml
@@ -3,9 +3,9 @@ name: Deploy Dev
 env:
   MODULES_REGISTRY: ${{ vars.DEV_REGISTRY }}
   CI_COMMIT_REF_NAME: ${{ github.event.inputs.tag }}
-  MODULES_MODULE_NAME: ${{ vars.RENAMED_MODULE_NAME }}
+  MODULES_MODULE_NAME: ${{ vars.MODULE_NAME }}
   MODULES_MODULE_SOURCE: ${{ vars.DEV_MODULE_SOURCE }}
-  MODULES_REGISTRY_LOGIN: ${{ vars.RENAMED_DEV_MODULES_REGISTRY_LOGIN }}
+  MODULES_REGISTRY_LOGIN: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }}
   MODULES_REGISTRY_PASSWORD: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
   RELEASE_CHANNEL: ${{ github.event.inputs.channel }}
   MODULES_MODULE_TAG: ${{ github.event.inputs.tag }}
diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml
index 42b67b4a..9e9c4072 100644
--- a/.github/workflows/deploy_prod.yml
+++ b/.github/workflows/deploy_prod.yml
@@ -4,9 +4,9 @@ env:
   MODULES_REGISTRY: ${{ vars.PROD_REGISTRY }}
   MODULE_SOURCE_NAME: ${{ vars.PROD_MODULE_SOURCE_NAME }}
   CI_COMMIT_REF_NAME: ${{ github.ref_name }}
-  MODULES_MODULE_NAME: ${{ vars.RENAMED_MODULE_NAME }}
+  MODULES_MODULE_NAME: ${{ vars.MODULE_NAME }}
   RELEASE_CHANNEL: ${{ github.event.inputs.version }}
-  MODULES_REGISTRY_LOGIN: ${{ vars.RENAMED_PROD_MODULES_REGISTRY_LOGIN }}
+  MODULES_REGISTRY_LOGIN: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }}
   MODULES_REGISTRY_PASSWORD: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
   MODULES_MODULE_TAG: ${{ github.event.inputs.tag }}