diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 73bfa7df54..1f32dbb5b6 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Set up dependencies
         run: |
           sudo dnf install -y dnf-plugins-core
-          sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
+          sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.repo
           sudo dnf install -y anda mock rpm-build git-core
           # add to safe directory
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
@@ -35,7 +35,6 @@ jobs:
       - run: git fetch
       #- run: git checkout HEAD^
 
-
       # - name: Generate Build matrix
       #   id: generate_build_matrix
       #   # generate build matrix by checking out changes in anda/
diff --git a/.github/workflows/bootstrap-anda.yml b/.github/workflows/bootstrap-anda.yml
index 585c7abf57..ba895d95ab 100644
--- a/.github/workflows/bootstrap-anda.yml
+++ b/.github/workflows/bootstrap-anda.yml
@@ -1,6 +1,5 @@
 name: Bootstrap anda
 
-
 on:
   workflow_dispatch:
 
@@ -8,7 +7,7 @@ jobs:
   bootstrap:
     strategy:
       matrix:
-        version: ["ad37"]
+        version: ["terra37"]
         arch: ["x86_64", "aarch64"]
       fail-fast: true
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -31,7 +30,7 @@ jobs:
       - name: Install repositories
         run: |
           sudo dnf install -y dnf-plugins-core
-          sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
+          sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.repo
       - run: sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel
       - uses: actions-rs/toolchain@v1
         with:
@@ -52,4 +51,4 @@ jobs:
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            ${{ matrix.version }} anda-build/rpm/rpms/*
\ No newline at end of file
+            ${{ matrix.version }} anda-build/rpm/rpms/*
diff --git a/.github/workflows/bootstrap-subatomic.yml b/.github/workflows/bootstrap-subatomic.yml
index 7770b2a318..23cd891086 100644
--- a/.github/workflows/bootstrap-subatomic.yml
+++ b/.github/workflows/bootstrap-subatomic.yml
@@ -1,6 +1,5 @@
 name: Bootstrap subatomic
 
-
 on:
   workflow_dispatch:
 
@@ -8,7 +7,7 @@ jobs:
   bootstrap:
     strategy:
       matrix:
-        version: ["ad37"]
+        version: ["terra37"]
         arch: ["x86_64", "aarch64"]
       fail-fast: true
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -16,13 +15,11 @@ jobs:
       image: fedora:37
       options: --cap-add=SYS_ADMIN --privileged
     steps:
-
       # - name: Run shell commands
       #   run: |
       #     git config --global url.https://github.com/.insteadOf git://github.com/
       #     git clone https://github.com/FyraLabs/anda.git
 
-
       - uses: actions/setup-go@v3
         with:
           go-version: "^1.19"
@@ -30,7 +27,7 @@ jobs:
       - name: Install repositories
         run: |
           sudo dnf install -y dnf-plugins-core
-          sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
+          sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.repo
       - run: sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel
       - uses: actions/checkout@v3
         with:
@@ -58,4 +55,4 @@ jobs:
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            ${{ matrix.version }} anda-build/rpm/rpms/*
\ No newline at end of file
+            ${{ matrix.version }} anda-build/rpm/rpms/*
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4a3473b09c..a7e9dd0f4a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
   parse:
     outputs:
       pkgs: ${{ steps.parsing.outputs.pkgs }}
-    runs-on: 'ubuntu-latest'
+    runs-on: "ubuntu-latest"
     steps:
       - name: Parse Input
         id: parsing
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["ad37"]
+        version: ["terra37"]
         arch: ["x86_64", "aarch64"]
       fail-fast: false
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -31,7 +31,7 @@ jobs:
       - name: Install repositories
         run: |
           sudo dnf install -y dnf-plugins-core
-          sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
+          sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.repo
           sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build mock-scm
 
       - uses: terrapkg/anda-build@main
@@ -39,7 +39,7 @@ jobs:
           name: "${{ matrix.pkg }}pkg"
           mockConfig: anda-37-${{ matrix.arch }}
           extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
-          andaRepo: https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
+          andaRepo: https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.repo
 
       - name: Install Subatomic client
         run: sudo dnf install -y subatomic-cli
diff --git a/.github/workflows/mass-rebuild.yml b/.github/workflows/mass-rebuild.yml
index 3ea0bed21c..7567e23fb1 100644
--- a/.github/workflows/mass-rebuild.yml
+++ b/.github/workflows/mass-rebuild.yml
@@ -49,7 +49,7 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["ad37"]
+        version: ["terra37"]
         arch: ["x86_64", "aarch64"]
       fail-fast: false
     #if: ${{ matrix.changed_folders != '' }}
@@ -61,7 +61,7 @@ jobs:
       - name: Install repositories
         run: |
           sudo dnf install -y dnf-plugins-core
-          sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
+          sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.repo
           sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build
 
       - uses: andaman-common-pkgs/anda-build@main
@@ -69,7 +69,7 @@ jobs:
         with:
           name: "anda/${{ matrix.pkg }}/pkg"
           mockConfig: anda-37-${{ matrix.arch }}
-          andaRepo: https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
+          andaRepo: https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.repo
 
       - name: Install Subatomic client
         run: sudo dnf install -y subatomic-cli
@@ -80,4 +80,4 @@ jobs:
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            ${{ matrix.version }} anda-build/rpm/rpms/*
\ No newline at end of file
+            ${{ matrix.version }} anda-build/rpm/rpms/*
diff --git a/anda/mock-configs/anda.tpl b/anda/mock-configs/anda.tpl
index 4d3a82191f..f171c9af8f 100644
--- a/anda/mock-configs/anda.tpl
+++ b/anda/mock-configs/anda.tpl
@@ -25,16 +25,17 @@ best=1
 module_platform_id=platform:fc{{ releasever }}
 protected_packages=
 
-[andaman-common]
-name=andaman-common
-baseurl=https://subatomic.fyralabs.com/ad$releasever/
-type=rpm-md
+[terra]
+name=Terra $releasever
+baseurl=https://repos.fyralabs.com/terra$releasever
+type=rpm
 skip_if_unavailable=True
-gpgcheck=0
-repo_gpgcheck=0
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc
 enabled=1
 enabled_metadata=1
-priority=50
+metadata_expire=4h
 
 [rpmfusion-free]
 name=RPM Fusion for Fedora $releasever - Free