diff --git a/Rakefile b/Rakefile
index 759edd80dcc..6ac3a479cba 100644
--- a/Rakefile
+++ b/Rakefile
@@ -64,27 +64,31 @@ namespace :docker do
   end
 
   namespace :maintainer do
+    def tags_for(container_type)
+      "-t openbuildservice/#{container_type}:#{VERSION} -t openbuildservice/#{container_type}"
+    end
+
     desc 'Rebuild all our static containers'
     task rebuild: ['rebuild:base', 'rebuild:backend', 'rebuild:frontend-base', 'rebuild:mariadb', 'rebuild:memcached', 'rebuild:old-test-suite'] do
     end
     namespace :rebuild do
       task :base do
-        sh "docker build docker-files/base/ -t openbuildservice/base:#{VERSION} -t openbuildservice/base -f docker-files/base/Dockerfile.#{VERSION}"
+        sh "docker build docker-files/base/ #{tags_for(:base)} -f docker-files/base/Dockerfile.#{VERSION}"
       end
       task :mariadb do
-        sh "docker build docker-files/mariadb/ -t openbuildservice/mariadb:#{VERSION} -t openbuildservice/mariadb -f docker-files/mariadb/Dockerfile.mariadb"
+        sh "docker build docker-files/mariadb/ #{tags_for(:mariadb)} -f docker-files/mariadb/Dockerfile.mariadb"
       end
       task :memcached do
-        sh "docker build docker-files/memcached/ -t openbuildservice/memcached:#{VERSION} -t openbuildservice/memcached -f docker-files/memcached/Dockerfile.memcached"
+        sh "docker build docker-files/memcached/ #{tags_for(:memcached)} -f docker-files/memcached/Dockerfile.memcached"
       end
       task 'frontend-base' do
-        sh "docker build src/api/ -t openbuildservice/frontend-base:#{VERSION} -t openbuildservice/frontend-base -f src/api/docker-files/Dockerfile.frontend-base"
+        sh "docker build src/api/ #{tags_for('frontend-base')} -f src/api/docker-files/Dockerfile.frontend-base"
       end
       task :backend do
-        sh "docker build src/backend/ -t openbuildservice/backend:#{VERSION} -t openbuildservice/backend -f src/backend/docker-files/Dockerfile.backend"
+        sh "docker build src/backend/ #{tags_for(:backend)} -f src/backend/docker-files/Dockerfile.backend"
       end
       task 'old-test-suite' do
-        sh "docker build src/api/ -t openbuildservice/old-test-suite:#{VERSION} -t openbuildservice/old-test-suite -f src/api/docker-files/Dockerfile.old-test-suite"
+        sh "docker build src/api/ #{tags_for('old-test-suite')} -f src/api/docker-files/Dockerfile.old-test-suite"
       end
     end
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 50a2da68e3a..748081a7e0b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,6 +23,7 @@ services:
   frontend:
     image: openbuildservice/frontend
     build:
+      dockerfile: docker-files/Dockerfile
       context: src/api
     volumes:
       - .:/obs
diff --git a/src/api/docker-files/Dockerfile b/src/api/docker-files/Dockerfile
index bec11b26446..e618764eae7 100644
--- a/src/api/docker-files/Dockerfile
+++ b/src/api/docker-files/Dockerfile
@@ -9,8 +9,8 @@ ARG CONTAINER_USERID
 # Configure our user
 RUN usermod -u $CONTAINER_USERID frontend
 
-ADD src/api/Gemfile /obs/src/api/Gemfile
-ADD src/api/Gemfile.lock /obs/src/api/Gemfile.lock
+ADD Gemfile /obs/src/api/Gemfile
+ADD Gemfile.lock /obs/src/api/Gemfile.lock
 RUN chown -R frontend /obs/src/api
 
 # foreman, which we only run in docker, needs a different thor version than OBS.