diff --git a/CHANGELOG b/CHANGELOG
index 5940d586d88620095167f4bf7a236ba0f1f86e20..7816430a208596b4b9257049b02dda2e0eff1663 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 8.0.0 (unreleased)
   - Search for comments should be case insensetive
   - Create cross-reference for closing references on commits pushed to non-default branches (Maël Valais)
   - Ability to search milestones
+  - Disabled DNS lookups for SSH in docker image (Rowan Wookey)
 
 v 7.14.1 (unreleased)
   - Only include base URL in OmniAuth full_host parameter (Stan Hu)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 05521af696354b1a8cffad2cfb23cbe56e13a315..304bb97409e813c9e855293257a1bb295248d7af 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,6 +25,9 @@ RUN mkdir -p /opt/gitlab/sv/sshd/supervise \
     && ln -s /opt/gitlab/sv/sshd /opt/gitlab/service \
     && mkdir -p /var/run/sshd
 
+# Disabling use DNS in ssh since it tends to slow connecting
+RUN echo "UseDNS no" >> /etc/ssh/sshd_config
+
 # Prepare default configuration
 RUN ( \
   echo "" && \