diff --git a/.circleci/config.yml b/.circleci/config.yml
index 793b99aa..62244bd0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,8 @@ orbs:
   docker: circleci/docker@2.4.0
   # https://circleci.com/developer/orbs/orb/circleci/python
   python: circleci/python@2.1.1
-
+  # https://circleci.com/developer/orbs/orb/circleci/shellcheck
+  shellcheck: circleci/shellcheck@3.2.0
 
 jobs:
   build-arm64:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index de3bdaa5..7fb42c3e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -156,12 +156,21 @@ jobs:
     - name: Checkout source
       uses: actions/checkout@v4
 
+    - name: Install manifest-tool
+      run: |
+            wget https://github.com/estesp/manifest-tool/releases/download/v2.0.8/binaries-manifest-tool-2.0.8.tar.gz
+            mkdir manifest-tool
+            tar -xvzf binaries-manifest-tool-2.0.8.tar.gz -C manifest-tool
+            sudo mv manifest-tool/manifest-tool-linux-amd64 /usr/local/bin/manifest-tool
+            manifest-tool -v
+
+    - run: pip install lastversion
+
     - name: Environment init
       run: source tools/environment_init.sh
 
     - run: make check_version
 
-#TODO: fix waiting for CircleCI
     - run: sleep 20m # Wait for CircleCI to finish building images; Temporary workarounds
 
     - name: Login to dockerhub
@@ -171,18 +180,6 @@ jobs:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
 
-    - name: Install manifest-tool
-      run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v2.0.8/binaries-manifest-tool-2.0.8.tar.gz
-          mkdir manifest-tool
-          tar -xvzf binaries-manifest-tool-2.0.8.tar.gz -C manifest-tool
-          sudo mv manifest-tool/manifest-tool-linux-amd64 /usr/local/bin/manifest-tool
-          manifest-tool -v
-
-#    - name: Update docker manifest
-#      if: ${{  (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request')  }}
-#      run: ./manifest.sh
-
     - name: push readme to docker hub api
       if: ${{  (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request')  }}
       env:
@@ -190,4 +187,7 @@ jobs:
         DOCKERHUB_ACCESS_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
       run: make push-readme
 
+    - name: Update docker manifest
+      if: ${{  (github.ref == 'refs/heads/master') && (github.event_name != 'pull_request')  }}
+      run: ./manifest.sh