diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 430e4abde..5fb5fe451 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,8 @@ docker-build:
     - dnf -y install git make
     - sed -i 's/short-name-mode="enforcing"/short-name-mode="permissive"/g' /etc/containers/registries.conf
     - ln -s /usr/bin/podman /usr/bin/docker
+    - podman system service --time 0 unix://var/run/podman/podman.sock &
+    - ln -s /var/run/podman/podman.sock /var/run/docker.sock
     - echo "$DOCKER_PASSWORD" | podman login -u "$DOCKER_USERNAME" registry.baalajimaestro.me --password-stdin
   variables:
     GO111MODULE: "on"
diff --git a/Makefile b/Makefile
index 43839d0ee..0c957b003 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ TRAEFIK_DEV_IMAGE := traefik-dev$(if $(GIT_BRANCH),:$(subst /,-,$(GIT_BRANCH)))
 REPONAME := $(shell echo $(REPO) | tr '[:upper:]' '[:lower:]')
 TRAEFIK_IMAGE := $(if $(REPONAME),$(REPONAME),"traefik/traefik")
 
-INTEGRATION_OPTS := $(if $(MAKE_DOCKER_HOST),-e "DOCKER_HOST=$(MAKE_DOCKER_HOST)",-v "/var/run/podman/podman.sock:/var/run/docker.sock")
+INTEGRATION_OPTS := $(if $(MAKE_DOCKER_HOST),-e "DOCKER_HOST=$(MAKE_DOCKER_HOST)",-v "/var/run/docker.sock:/var/run/docker.sock")
 DOCKER_BUILD_ARGS := $(if $(DOCKER_VERSION), "--build-arg=DOCKER_VERSION=$(DOCKER_VERSION)",)
 
 # only used when running in docker