diff --git a/.drone.yml b/.drone.yml
index 1d169ec..9907671 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -95,13 +95,25 @@ steps:
     - push
     - pull_request
 
-- name: build-debian-7
+- name: build-debian-9
   image: plugins/docker
   settings:
-    dockerfile: debian-8/Dockerfile
+    dockerfile: debian-9/Dockerfile
     dry_run: true
     repo: lerentis/ansible
-    tag: debian-7
+    tag: debian-9
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-debian-10
+  image: plugins/docker
+  settings:
+    dockerfile: debian-10/Dockerfile
+    dry_run: true
+    repo: lerentis/ansible
+    tag: debian-10
   when:
     event:
     - push
@@ -241,14 +253,28 @@ steps:
     event:
     - tag
 
-- name: build-debian-7-publish
+- name: build-debian-9-publish
   image: plugins/docker
   settings:
-    dockerfile: debian-8/Dockerfile
+    dockerfile: debian-9/Dockerfile
     password:
       from_secret: docker_password
     repo: lerentis/ansible
-    tag: debian-7
+    tag: debian-9
+    username:
+      from_secret: docker_username
+  when:
+    event:
+    - tag
+
+- name: build-debian-10-publish
+  image: plugins/docker
+  settings:
+    dockerfile: debian-10/Dockerfile
+    password:
+      from_secret: docker_password
+    repo: lerentis/ansible
+    tag: debian-10
     username:
       from_secret: docker_username
   when:
@@ -315,7 +341,8 @@ steps:
   - build-fedora-24
   - build-alpine-3
   - build-debian-8
-  - build-debian-7
+  - build-debian-9
+  - build-debian-10
   - build-centos-7
   - build-centos-8
   - build-arch
@@ -326,7 +353,8 @@ steps:
   - build-fedora-24-publish
   - build-alpine-3-publish
   - build-debian-8-publish
-  - build-debian-7-publish
+  - build-debian-9-publish
+  - build-debian-10-publish
   - build-centos-7-publish
   - build-centos-8-publish
   - build-arch-publish
diff --git a/debian-10/Dockerfile b/debian-10/Dockerfile
new file mode 100644
index 0000000..b07b4b3
--- /dev/null
+++ b/debian-10/Dockerfile
@@ -0,0 +1,20 @@
+FROM debian:10
+
+RUN apt-get -q update \
+    && apt-get -yq install --no-install-recommends \
+      build-essential \
+      libffi-dev \
+      libssl-dev \
+      python3 \
+      python3-dev \
+      python3-pip \
+      git \
+      apt-utils \
+      curl \
+      ansible \
+    && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
+    && chmod +rx /usr/local/bin/goss \
+    && apt-get clean 
+
+
+CMD ["ansible-playbook", "--help"]
diff --git a/debian-7/Dockerfile b/debian-7/Dockerfile
deleted file mode 100644
index a3c6d26..0000000
--- a/debian-7/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM debian:7
-
-RUN apt-get -q update \
-    && apt-get install -y python-pip python-dev git apt-utils curl \
-    && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
-    && chmod +rx /usr/local/bin/goss
-
-RUN pip install --index-url=https://pypi.python.org/simple/ --upgrade pip
-
-RUN pip install git+https://github.com/ansible/ansible.git@devel
-
-CMD ["ansible-playbook", "--help"]
diff --git a/debian-8/Dockerfile b/debian-8/Dockerfile
index c8fefa9..fe4775e 100644
--- a/debian-8/Dockerfile
+++ b/debian-8/Dockerfile
@@ -5,17 +5,17 @@ RUN apt-get -q update \
       build-essential \
       libffi-dev \
       libssl-dev \
-      python \
-      python-dev \
-      python-pip \
+      python3 \
+      python3-dev \
+      python3-pip \
       git \
       apt-utils \
       curl \
     && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
     && chmod +rx /usr/local/bin/goss \
     && apt-get clean \
-    && pip install --upgrade pip
+    && pip3 install --upgrade pip
 
-RUN pip install git+https://github.com/ansible/ansible.git@devel
+RUN pip3 install ansible
 
 CMD ["ansible-playbook", "--help"]
diff --git a/debian-9/Dockerfile b/debian-9/Dockerfile
new file mode 100644
index 0000000..e713247
--- /dev/null
+++ b/debian-9/Dockerfile
@@ -0,0 +1,21 @@
+FROM debian:9
+
+RUN apt-get -q update \
+    && apt-get -yq install --no-install-recommends \
+      build-essential \
+      libffi-dev \
+      libssl-dev \
+      python3 \
+      python3-dev \
+      python3-pip \
+      git \
+      apt-utils \
+      curl \
+      ansible \
+    && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
+    && chmod +rx /usr/local/bin/goss \
+    && apt-get clean \
+    && pip3 install --upgrade pip
+
+
+CMD ["ansible-playbook", "--help"]