diff --git a/roles/docker/tasks/buildx.yml b/roles/docker/tasks/buildx.yml
new file mode 100644
index 0000000..82515a9
--- /dev/null
+++ b/roles/docker/tasks/buildx.yml
@@ -0,0 +1,24 @@
+# ===================================================================================================
+#  ?                                           ABOUT
+#  @author         :  Noah Knegt
+#  @email          :  personal@noahknegt.com
+#  @repo           :  https://git.noahknegt.com/noah.knegt/ansible-automations
+#  @createdOn      :  06-04-2023
+#  @description    :  This will make sure that docker buildx is installed.
+# ===================================================================================================
+
+---
+- name: Check for docker-buildx
+  shell: docker buildx version
+  register: docker_buildx
+  ignore_errors: true
+
+- name: Install docker-buildx
+  package:
+    name: docker-buildx
+    state: present
+  when: docker_buildx.stdout is not defined
+
+- name: Alias docker-buildx
+  shell: docker buildx install
+  when: docker_buildx.stdout is not defined
diff --git a/roles/docker/tasks/check_version.yml b/roles/docker/tasks/check_version.yml
index 205e8ac..3594c6e 100644
--- a/roles/docker/tasks/check_version.yml
+++ b/roles/docker/tasks/check_version.yml
@@ -11,6 +11,7 @@
 - name: Check docker version
   shell: docker --version
   register: docker_version
+  ignore_errors: true
 
 - name: Install jq
   become: true
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 9eeac7d..9c4eb28 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -21,3 +21,5 @@
 
 - include_tasks: cleanup.yml
   when: docker_update is defined
+
+- include_tasks: buildx.yml