diff --git a/.github/workflows/code_review.yml b/.github/workflows/code_review.yml
index f833bb4a..92cbce1d 100644
--- a/.github/workflows/code_review.yml
+++ b/.github/workflows/code_review.yml
@@ -59,7 +59,7 @@ jobs:
         # from https://github.com/Azure/login/commits/master
         uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2
         with:
-          client-id: ${{ secrets.CLIENT_ID }}
+          client-id: ${{ secrets.CD_CLIENT_ID }}
           tenant-id: ${{ secrets.TENANT_ID }}
           subscription-id: ${{ secrets.SUBSCRIPTION_ID }}
 
diff --git a/.github/workflows/create_dashboard.yaml b/.github/workflows/create_dashboard.yaml
index faad575a..20b38667 100644
--- a/.github/workflows/create_dashboard.yaml
+++ b/.github/workflows/create_dashboard.yaml
@@ -27,6 +27,8 @@ jobs:
       matrix:
         environment: [prod]
         product: [internal, node]
+        version: [v1, v2]
+      max-parallel: 1
     environment:
       name: ${{ matrix.environment }}
     # Steps represent a sequence of tasks that will be executed as part of the job
@@ -42,8 +44,8 @@ jobs:
       - uses: pagopa/opex-dashboard-azure-action@v1.1.2
         with:
           environment: ${{ matrix.environment }}
-          api-name: ${{ matrix.product }}
-          config: .opex/${{ matrix.product }}/env/${{ matrix.environment }}/config.yaml
+          api-name: ${{ matrix.product }}/${{ matrix.version }}
+          config: .opex/${{ matrix.product }}/${{ matrix.version }}/env/${{ matrix.environment }}/config.yaml
           client-id: ${{ secrets.CD_CLIENT_ID }}
           tenant-id: ${{ secrets.TENANT_ID }}
           subscription-id: ${{ secrets.SUBSCRIPTION_ID }}
diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml
index b46acedf..8a56abb8 100644
--- a/.github/workflows/integration_test.yml
+++ b/.github/workflows/integration_test.yml
@@ -47,7 +47,7 @@ jobs:
         # from https://github.com/Azure/login/commits/master
         uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2
         with:
-          client-id: ${{ secrets.CLIENT_ID }}
+          client-id: ${{ secrets.CD_CLIENT_ID }}
           tenant-id: ${{ secrets.TENANT_ID }}
           subscription-id: ${{ secrets.SUBSCRIPTION_ID }}
 
diff --git a/.opex/internal/env/prod/backend.ini b/.opex/internal/v1/env/prod/backend.ini
similarity index 100%
rename from .opex/internal/env/prod/backend.ini
rename to .opex/internal/v1/env/prod/backend.ini
diff --git a/.opex/internal/env/prod/backend.tfvars b/.opex/internal/v1/env/prod/backend.tfvars
similarity index 100%
rename from .opex/internal/env/prod/backend.tfvars
rename to .opex/internal/v1/env/prod/backend.tfvars
diff --git a/.opex/internal/env/prod/config.yaml b/.opex/internal/v1/env/prod/config.yaml
similarity index 95%
rename from .opex/internal/env/prod/config.yaml
rename to .opex/internal/v1/env/prod/config.yaml
index 18a0a74c..415f3bea 100644
--- a/.opex/internal/env/prod/config.yaml
+++ b/.opex/internal/v1/env/prod/config.yaml
@@ -1,5 +1,5 @@
 oa3_spec: ./openapi/openapi-v1.json # If start with http the file would be downloaded from the internet
-name: opex_pagopa-afm-calculator
+name: opex_pagopa-afm-calculator_v1
 location: West Europe
 timespan: 5m # Default, a number or a timespan https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan
 data_source: /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-vnet-rg/providers/Microsoft.Network/applicationGateways/pagopa-p-app-gw
diff --git a/.opex/internal/env/prod/terraform.tfvars b/.opex/internal/v1/env/prod/terraform.tfvars
similarity index 100%
rename from .opex/internal/env/prod/terraform.tfvars
rename to .opex/internal/v1/env/prod/terraform.tfvars
diff --git a/.opex/node/env/prod/backend.ini b/.opex/internal/v2/env/prod/backend.ini
similarity index 100%
rename from .opex/node/env/prod/backend.ini
rename to .opex/internal/v2/env/prod/backend.ini
diff --git a/.opex/internal/v2/env/prod/backend.tfvars b/.opex/internal/v2/env/prod/backend.tfvars
new file mode 100644
index 00000000..4fcbfcd1
--- /dev/null
+++ b/.opex/internal/v2/env/prod/backend.tfvars
@@ -0,0 +1,4 @@
+resource_group_name  = "io-infra-rg"
+storage_account_name = "pagopainfraterraformprod"
+container_name       = "azurermstate"
+key                  = "opex.pagopa-afm-calculator.terraform.tfstate"
diff --git a/.opex/internal/v2/env/prod/config.yaml b/.opex/internal/v2/env/prod/config.yaml
new file mode 100644
index 00000000..462bd165
--- /dev/null
+++ b/.opex/internal/v2/env/prod/config.yaml
@@ -0,0 +1,11 @@
+oa3_spec: ./openapi/openapi-v2.json # If start with http the file would be downloaded from the internet
+name: opex_pagopa-afm-calculator_v2
+location: West Europe
+timespan: 5m # Default, a number or a timespan https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan
+data_source: /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-vnet-rg/providers/Microsoft.Network/applicationGateways/pagopa-p-app-gw
+action_groups:
+  - /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-monitor-rg/providers/microsoft.insights/actionGroups/PagoPA
+  - /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-monitor-rg/providers/microsoft.insights/actionGroups/SlackPagoPA
+overrides:
+  hosts: # Use these hosts instead of those inside the OpenApi spec
+    - api.platform.pagopa.it
diff --git a/.opex/node/env/prod/terraform.tfvars b/.opex/internal/v2/env/prod/terraform.tfvars
similarity index 100%
rename from .opex/node/env/prod/terraform.tfvars
rename to .opex/internal/v2/env/prod/terraform.tfvars
diff --git a/.opex/node/v1/env/prod/backend.ini b/.opex/node/v1/env/prod/backend.ini
new file mode 100644
index 00000000..63184253
--- /dev/null
+++ b/.opex/node/v1/env/prod/backend.ini
@@ -0,0 +1 @@
+subscription=PROD-pagoPA
diff --git a/.opex/node/env/prod/backend.tfvars b/.opex/node/v1/env/prod/backend.tfvars
similarity index 100%
rename from .opex/node/env/prod/backend.tfvars
rename to .opex/node/v1/env/prod/backend.tfvars
diff --git a/.opex/node/env/prod/config.yaml b/.opex/node/v1/env/prod/config.yaml
similarity index 95%
rename from .opex/node/env/prod/config.yaml
rename to .opex/node/v1/env/prod/config.yaml
index d063b2c5..51c2e4ec 100644
--- a/.opex/node/env/prod/config.yaml
+++ b/.opex/node/v1/env/prod/config.yaml
@@ -1,5 +1,5 @@
 oa3_spec: ./openapi/openapi-node-v1.json # If start with http the file would be downloaded from the internet
-name: opex_pagopa-afm-calculator_node
+name: opex_pagopa-afm-calculator_node_v1
 location: West Europe
 timespan: 5m # Default, a number or a timespan https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan
 data_source: /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-vnet-rg/providers/Microsoft.Network/applicationGateways/pagopa-p-app-gw
diff --git a/.opex/node/v1/env/prod/terraform.tfvars b/.opex/node/v1/env/prod/terraform.tfvars
new file mode 100644
index 00000000..97c20d81
--- /dev/null
+++ b/.opex/node/v1/env/prod/terraform.tfvars
@@ -0,0 +1,10 @@
+prefix    = "pagopa"
+env_short = "p"
+
+tags = {
+  CreatedBy   = "Terraform"
+  Environment = "Prod"
+  Owner       = "pagoPA"
+  Source      = "https://github.com/pagopa/pagopa-afm-calculator"
+  CostCenter  = "TS310 - PAGAMENTI & SERVIZI"
+}
diff --git a/.opex/node/v2/env/prod/backend.ini b/.opex/node/v2/env/prod/backend.ini
new file mode 100644
index 00000000..63184253
--- /dev/null
+++ b/.opex/node/v2/env/prod/backend.ini
@@ -0,0 +1 @@
+subscription=PROD-pagoPA
diff --git a/.opex/node/v2/env/prod/backend.tfvars b/.opex/node/v2/env/prod/backend.tfvars
new file mode 100644
index 00000000..69887bbb
--- /dev/null
+++ b/.opex/node/v2/env/prod/backend.tfvars
@@ -0,0 +1,4 @@
+resource_group_name  = "io-infra-rg"
+storage_account_name = "pagopainfraterraformprod"
+container_name       = "azurermstate"
+key                  = "opex.pagopa-afm-calculator_node.terraform.tfstate"
diff --git a/.opex/node/v2/env/prod/config.yaml b/.opex/node/v2/env/prod/config.yaml
new file mode 100644
index 00000000..8acdb9d8
--- /dev/null
+++ b/.opex/node/v2/env/prod/config.yaml
@@ -0,0 +1,11 @@
+oa3_spec: ./openapi/openapi-node-v2.json # If start with http the file would be downloaded from the internet
+name: opex_pagopa-afm-calculator_node_v2
+location: West Europe
+timespan: 5m # Default, a number or a timespan https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan
+data_source: /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-vnet-rg/providers/Microsoft.Network/applicationGateways/pagopa-p-app-gw
+action_groups:
+  - /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-monitor-rg/providers/microsoft.insights/actionGroups/PagoPA
+  - /subscriptions/b9fc9419-6097-45fe-9f74-ba0641c91912/resourceGroups/pagopa-p-monitor-rg/providers/microsoft.insights/actionGroups/SlackPagoPA
+overrides:
+  hosts: # Use these hosts instead of those inside the OpenApi spec
+    - api.platform.pagopa.it
diff --git a/.opex/node/v2/env/prod/terraform.tfvars b/.opex/node/v2/env/prod/terraform.tfvars
new file mode 100644
index 00000000..97c20d81
--- /dev/null
+++ b/.opex/node/v2/env/prod/terraform.tfvars
@@ -0,0 +1,10 @@
+prefix    = "pagopa"
+env_short = "p"
+
+tags = {
+  CreatedBy   = "Terraform"
+  Environment = "Prod"
+  Owner       = "pagoPA"
+  Source      = "https://github.com/pagopa/pagopa-afm-calculator"
+  CostCenter  = "TS310 - PAGAMENTI & SERVIZI"
+}