diff --git a/.github/workflows/infra-ci-template.yml b/.github/workflows/_ci-infra-template.yml
similarity index 97%
rename from .github/workflows/infra-ci-template.yml
rename to .github/workflows/_ci-infra-template.yml
index 63b3e27b..45ca45bc 100644
--- a/.github/workflows/infra-ci-template.yml
+++ b/.github/workflows/_ci-infra-template.yml
@@ -1,4 +1,4 @@
-name: infra-ci-template.yml
+name: "Template: Deploy Infra"
 
 on:
   workflow_call:
diff --git a/.github/workflows/infra-cd.yml b/.github/workflows/cd-infra.yml
similarity index 83%
rename from .github/workflows/infra-cd.yml
rename to .github/workflows/cd-infra.yml
index 40e470ab..b8042fb1 100644
--- a/.github/workflows/infra-cd.yml
+++ b/.github/workflows/cd-infra.yml
@@ -1,4 +1,4 @@
-name: Infra CD
+name: "CD: Infra"
 
 on:
   workflow_dispatch:
@@ -18,7 +18,7 @@ jobs:
   cert:
     name: Cert
     secrets: inherit
-    uses: ./.github/workflows/infra-cd-template.yml
+    uses: ./.github/workflows/_deploy-app-terraform.yml
     strategy:
       matrix:
         environment: [at21, at22]
@@ -30,7 +30,7 @@ jobs:
   auth:
     name: Auth
     secrets: inherit
-    uses: ./.github/workflows/infra-cd-template.yml
+    uses: ./.github/workflows/_deploy-app-terraform.yml
     strategy:
       matrix:
         environment: [at21, at22]
@@ -42,7 +42,7 @@ jobs:
   register:
     name: Altinn Register
     secrets: inherit
-    uses: ./.github/workflows/infra-cd-template.yml
+    uses: ./.github/workflows/_deploy-app-terraform.yml
     strategy:
       matrix:
         environment: [at21, at22]
diff --git a/.github/workflows/infra-ci.yml b/.github/workflows/ci-infra.yml
similarity index 75%
rename from .github/workflows/infra-ci.yml
rename to .github/workflows/ci-infra.yml
index 282aacc1..7b379784 100644
--- a/.github/workflows/infra-ci.yml
+++ b/.github/workflows/ci-infra.yml
@@ -1,4 +1,4 @@
-name: Infra CI
+name: "CI: Infra"
 
 on:
   workflow_dispatch:
@@ -12,7 +12,7 @@ jobs:
   cert:
     name: Cert
     secrets: inherit
-    uses: ./.github/workflows/infra-ci-template.yml
+    uses: ./.github/workflows/_deploy-infra-template.yml
     with:
       environment: at21
       tf_state: cert.tfstate
@@ -21,7 +21,7 @@ jobs:
   auth:
     name: Auth
     secrets: inherit
-    uses: ./.github/workflows/infra-ci-template.yml
+    uses: ./.github/workflows/_deploy-infra-template.yml
     with:
       environment: at21
       tf_state: auth.tfstate
@@ -30,7 +30,7 @@ jobs:
   register:
     name: Altinn Register
     secrets: inherit
-    uses: ./.github/workflows/infra-ci-template.yml
+    uses: ./.github/workflows/_deploy-infra-template.yml
     with:
       environment: at21
       tf_state: Altinn.Register.tfstate