diff --git a/.drone.yml b/.drone.yml
index fb9323d..01a8483 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,6 +1,6 @@
 ---
 kind: pipeline
-name: default
+name: gce
 
 steps:
   - name: dryrun
@@ -10,8 +10,9 @@ steps:
       dry_run: true
       password:
         from_secret: docker_password
-      repo: xoxys/molecule-gce
-      tags: linux-amd64
+      repo: xoxys/molecule
+      dockerfile: docker/Dockerfile.gce
+      tags: gce
       username:
         from_secret: docker_username
     when:
@@ -24,9 +25,11 @@ steps:
     image: plugins/docker:linux-amd64
     settings:
       auto_tag: true
+      auto_tag_suffix: gce
+      dockerfile: docker/Dockerfile.gce
       password:
         from_secret: docker_password
-      repo: xoxys/molecule-gce
+      repo: xoxys/molecule
       username:
         from_secret: docker_username
     when:
@@ -34,17 +37,24 @@ steps:
       - push
       - tag
 
-  # - name: notify
-  #   image: plugins/matrix
-  #   settings:
-  #     homeserver: https://matrix.rknet.org
-  #     roomid: MtidqQXWWAtQcByBhH:rknet.org
-  #     template: "Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}"
-  #     username:
-  #       from_secret: matrix_username
-  #     password:
-  #       from_secret: matrix_password
-  #   when:
-  #     status:
-  #       - success
-  #       - failure
+# ---
+# kind: pipeline
+# name: notifications
+
+# steps:
+#   - name: notify
+#     image: plugins/matrix
+#     settings:
+#       homeserver: https://matrix.rknet.org
+#       roomid: MtidqQXWWAtQcByBhH:rknet.org
+#       template: "Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}"
+#       username:
+#         from_secret: matrix_username
+#       password:
+#         from_secret: matrix_password
+#     when:
+#       status:
+#         - success
+#         - failure
+
+# ...
diff --git a/Dockerfile b/docker/Dockerfile.gce
similarity index 90%
rename from Dockerfile
rename to docker/Dockerfile.gce
index 2b169b6..2c68015 100644
--- a/Dockerfile
+++ b/docker/Dockerfile.gce
@@ -26,10 +26,10 @@ ENV PACKAGES="\
 "
 
 ENV PIP_PACKAGES="\
-    molecule[azure,docker,docs,ec2,gce,lxc,openstack,vagrant,windows] \
+    molecule[gce] \
     virtualenv \
     apache-libcloud \
-    pycrypto
+    pycrypto \
 "
 
 ENV GEM_PACKAGES="\