diff --git a/.circleci/config.yml b/.circleci/config.yml
index dc804cf87e7..3aa48d70c87 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   codestyle_and_sql:
     docker:
-      - image: funjoker/circle-ci:4.3.4-buildpacks-focal
+      - image: funjoker/circle-ci:4.3.4-buildpacks-hirsute
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -40,7 +40,7 @@ jobs:
             cat sql/updates/hotfixes/4.3.4/*.sql | mysql -h 127.0.0.1 -uroot hotfixes
   pch:
     docker:
-      - image: funjoker/circle-ci:4.3.4-buildpacks-focal
+      - image: funjoker/circle-ci:4.3.4-buildpacks-hirsute
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -88,7 +88,7 @@ jobs:
           path: docker.tar.gz
   nopch:
     docker:
-      - image: funjoker/circle-ci:4.3.4-buildpacks-focal
+      - image: funjoker/circle-ci:4.3.4-buildpacks-hirsute
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
diff --git a/contrib/Docker/Dockerfile b/contrib/Docker/Dockerfile
index e5f07c6a6b1..7b8253318bf 100644
--- a/contrib/Docker/Dockerfile
+++ b/contrib/Docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM funjoker/circle-ci:4.3.4-buildpacks-focal
+FROM funjoker/circle-ci:4.3.4-buildpacks-hirsute
 
 #Setup
 WORKDIR /home/circleci