diff --git a/alpine/entrypoint.sh b/alpine/entrypoint.sh
index 04d87324..080da0dd 100755
--- a/alpine/entrypoint.sh
+++ b/alpine/entrypoint.sh
@@ -156,6 +156,7 @@ fi
 
 find /conf.d -name '*.yaml' -exec cp --parents {} /opt/datadog-agent/agent \;
 
+mkdir -p /opt/datadog-agent/agent/checks.d
 find /checks.d -name '*.py' -exec cp {} /opt/datadog-agent/agent/checks.d \;
 
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 4d313518..99dd772f 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -171,6 +171,7 @@ fi
 
 find /conf.d -name '*.yaml' -exec cp --parents {} /etc/dd-agent \;
 
+mkdir -p /etc/dd-agent/checks.d
 find /checks.d -name '*.py' -exec cp {} /etc/dd-agent/checks.d \;