diff --git a/.circleci/template.yml b/.circleci/template.yml
index 40a7ba82591..f60ad23b969 100644
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@@ -447,6 +447,15 @@ jobs:
       - run:
           name: Execute Docker image build and upload
           command: tools/circle-build-and-push-docker.sh
+      - persist_workspace
+
+  docker_smoke_test:
+    executor: << parameters.executor >>
+    parameters:
+      executor:
+        type: executor
+    steps:
+      - restore_workspace
       - run:
           name: Smoke testing
           command: IMAGE_TAG=`cat image_tag` mongooseim-docker/smoke_test.sh
@@ -967,3 +976,13 @@ workflows:
             - edoc
 
           filters: *all_tags
+      - docker_smoke_test:
+          name: docker_smoke_test
+          executor: otp_25
+          requires:
+            - docker_build_and_ship
+      - docker_smoke_test:
+          name: docker_smoke_test_arm64
+          executor: arm64
+          requires:
+            - docker_build_and_ship