diff --git a/custom/testing/golden-state-tree/os/amazon/pkgs/init.sls b/custom/testing/golden-state-tree/os/amazon/pkgs/init.sls
index 5cae5d7..5be01d8 100644
--- a/custom/testing/golden-state-tree/os/amazon/pkgs/init.sls
+++ b/custom/testing/golden-state-tree/os/amazon/pkgs/init.sls
@@ -42,5 +42,5 @@ include:
   {#- OS Specific packages install #}
   - .epel-release
   {%- if grains['osarch'] not in ('amd64', 'armhf', 'arm64') %}
-  - .docker
+  {#- - .docker #}
   {%- endif %}
diff --git a/custom/testing/golden-state-tree/os/debian/pkgs/init.sls b/custom/testing/golden-state-tree/os/debian/pkgs/init.sls
index 5e39c19..0d2fba9 100644
--- a/custom/testing/golden-state-tree/os/debian/pkgs/init.sls
+++ b/custom/testing/golden-state-tree/os/debian/pkgs/init.sls
@@ -3,7 +3,9 @@ include:
   - pkgs.curl
   - pkgs.dmidecode
   - pkgs.dnsutils
+  {%- if grains['osrelease'] == '11' %}
   - pkgs.docker
+  {%- endif %}
   - pkgs.file
   - pkgs.gcc
   - pkgs.gpg