diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88a6565aa17012edc0ccc8a09d86c4277c4f3d9f..7d205d76a2a59db4fdbe4740a8bbb0f8f4a25d90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,37 @@
 include:
   local: /gitlab-ci-template.yml
 
+stages:
+  - build
+  - test
+  - tag
+
 variables:
-  CI_REGISTRY_IMAGE_VERSION: "1.0.0"
+  CI_REGISTRY_IMAGE_VERSION: "1.1.0"
   CI_REGISTRY_BUILD_ARG: "--build-arg 0.2.0"
 
+
+container-test:
+  stage: test
+  inherit:
+    default: false
+    variables:
+      - CI_REGISTRY
+      - CI_REGISTRY_USER
+      - CI_REGISTRY_PASSWORD
+      - CI_REGISTRY_IMAGE
+      - CI_REGISTRY_BUILD_ARGS
+  image: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
+  before_script:
+    - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  script:
+    - podman build --pull $CI_REGISTRY_BUILD_ARGS -t "build-image:test" .
+    - si-tagging -l "build-image:test" "example.com/tagging-image" "0.1.2.3"
+    - podman images --format "{{.Repository}}:{{.Tag}}" | grep -Pe "^example.com/tagging-image:0.1.2$"
+    - podman images --format "{{.Repository}}:{{.Tag}}" | grep "latest"
+    - podman images --format "{{.Repository}}:{{.Tag}}" | grep -Pe "^example.com/tagging-image:0$"
+
+
 container-tagging:
   only:
     - master
diff --git a/Dockerfile b/Dockerfile
index aa6ef1ab93bd5a1119accf6bb7c44ed1e8c1b299..61e630a6b04731b53ef88aa1d03f0b0c6c87b1df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM docker.io/library/fedora:32
 
 COPY resources/storage.conf /etc/containers/