diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 80c6b00e..455a0370 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   flake8:
     name: run flake8
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: set up python 3.11
         uses: actions/setup-python@v2
@@ -23,7 +23,7 @@ jobs:
 
   black:
     name: run black
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: set up python 3.11
         uses: actions/setup-python@v2
@@ -41,7 +41,7 @@ jobs:
 
   bandit:
     name: run bandit
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: set up python 3.11
         uses: actions/setup-python@v2
@@ -56,4 +56,3 @@ jobs:
 
       - name: run bandit security checks
         run: tox -e bandit
-
diff --git a/.github/workflows/merge-main-to-develop.yml b/.github/workflows/merge-main-to-develop.yml
index 66820363..38356334 100644
--- a/.github/workflows/merge-main-to-develop.yml
+++ b/.github/workflows/merge-main-to-develop.yml
@@ -6,18 +6,17 @@ on:
 
 jobs:
   merge-main-to-develop:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - run: .github/scripts/merge-main-to-develop.sh
   tag-latest:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: merge-main-to-develop
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - run: .github/scripts/tag-latest.sh
-      
\ No newline at end of file
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index b1d92afc..9d13114d 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   coverage:
     name: code coverage check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: set up python 3.11
@@ -42,7 +42,7 @@ jobs:
 
   pytest:
     name: pytest
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: set up python 3.11
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 45386086..728c14eb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,11 +3,11 @@ on:
   workflow_dispatch:
     inputs:
       tag_or_release:
-        description: 'must be string of either "tag" or "release"'     
+        description: 'must be string of either "tag" or "release"'
         required: true
         default: 'tag'
       name:
-        description: 'the tag or release name, i.e. v1.0.0'     
+        description: 'the tag or release name, i.e. v1.0.0'
         required: true
       source_branch:
         description: 'the branch to tag or release'
@@ -16,7 +16,7 @@ on:
 
 jobs:
   tag_or_release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: tag or release the given branch with the given name
     steps:
       - name: checkout
diff --git a/.github/workflows/tag-latest.yml b/.github/workflows/tag-latest.yml
index dcfe6e9f..cca82917 100644
--- a/.github/workflows/tag-latest.yml
+++ b/.github/workflows/tag-latest.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   update-latest-tag:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - run: .github/scripts/tag-latest.sh
\ No newline at end of file
diff --git a/.github/workflows/tag-stable.yml b/.github/workflows/tag-stable.yml
index 55bcc3e8..f2ee659a 100644
--- a/.github/workflows/tag-stable.yml
+++ b/.github/workflows/tag-stable.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   update-stable-tag:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - run: .github/scripts/tag-stable.sh
\ No newline at end of file
diff --git a/changelog.md b/changelog.md
index e9f1ee8b..756136a0 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,2 +1 @@
 - update caldp version and changelog.md
-- update base image in AMI rotation Dockerfile
diff --git a/terraform/deploy_vars.sh b/terraform/deploy_vars.sh
index b99bae14..6ee56c10 100755
--- a/terraform/deploy_vars.sh
+++ b/terraform/deploy_vars.sh
@@ -1,7 +1,8 @@
 #! /bin/bash -xu
-export CALCLOUD_VER="v0.4.46"
-export CALDP_VER="v0.2.28"
-export CAL_BASE_IMAGE="stsci/hst-pipeline:2025.2.1.4-photutils-py311"
+export CALCLOUD_VER="v0.4.47"
+export CALDP_VER="v0.2.29"
+export CAL_BASE_IMAGE="stsci/hst-pipeline:2025.3.1.7-alignmentmatches-py311"
+
 export BASE_IMAGE_TAG=`cut -d ":" -f2- <<< ${CAL_BASE_IMAGE} `
 
 export COMMON_IMAGE_TAG="CALCLOUD_${CALCLOUD_VER}-CALDP_${CALDP_VER}-BASE_${BASE_IMAGE_TAG}"
diff --git a/terraform/variables.tf b/terraform/variables.tf
index 8f274e1d..b04ef7ae 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -117,10 +117,10 @@ variable crds_context {
   description = "the crds context to be the default for the environment"
   type = map(string)
   default = {
-    "-sb" = "hst_1205.pmap"
-    "-dev" = "hst_1205.pmap"
-    "-test" = "hst_1211.pmap"
-    "-ops" = "hst_1211.pmap"
+    "-sb" = "hst_1241.pmap"
+    "-dev" = "hst_1241.pmap"
+    "-test" = "hst_1247.pmap"
+    "-ops" = "hst_1247.pmap"
   }
 }