diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 250122f..f46ae85 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,8 +7,8 @@ variables:
   stage: build
   script:
     - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" registry.gitlab.com
-    - docker build -t "$REPOSITORY/$CI_BUILD_NAME" -f "Dockerfile.$CI_BUILD_NAME" .
-    - docker push "$REPOSITORY/$CI_BUILD_NAME"
+    - docker build -t "$REPOSITORY:$CI_BUILD_NAME" -f "Dockerfile.$CI_BUILD_NAME" .
+    - docker push "$REPOSITORY:$CI_BUILD_NAME"
 
 ruby-2.1: *build_and_deploy
 ruby-2.2: *build_and_deploy
diff --git a/Dockerfile.omnibus-debian-jessie b/Dockerfile.omnibus-debian-jessie
deleted file mode 100644
index ffd8845..0000000
--- a/Dockerfile.omnibus-debian-jessie
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM debian:jessie
-
-ADD / /
-RUN /scripts/install-essentials
-RUN /scripts/install-git
-RUN /scripts/install-ruby
diff --git a/Dockerfile.omnibus-debian-wheezy b/Dockerfile.omnibus-debian-wheezy
deleted file mode 100644
index 790f06a..0000000
--- a/Dockerfile.omnibus-debian-wheezy
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM debian:wheezy
-
-ADD / /
-RUN /scripts/install-essentials
-RUN /scripts/install-git
-RUN /scripts/install-ruby
diff --git a/Dockerfile.omnibus-raspbian-jessie b/Dockerfile.omnibus-raspbian-jessie
deleted file mode 100644
index e544792..0000000
--- a/Dockerfile.omnibus-raspbian-jessie
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM resin/rpi-raspbian:jessie
-
-ADD / /
-RUN /scripts/install-essentials
-RUN /scripts/install-git
-RUN /scripts/install-ruby
diff --git a/Dockerfile.omnibus-raspbian-wheezy b/Dockerfile.omnibus-raspbian-wheezy
deleted file mode 100644
index 100bd73..0000000
--- a/Dockerfile.omnibus-raspbian-wheezy
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM resin/rpi-raspbian:wheezy
-
-ADD / /
-RUN /scripts/install-essentials
-RUN /scripts/install-git
-RUN /scripts/install-ruby