diff --git a/.circleci/config.yml b/.circleci/config.yml
index 56e8a85a6..1a911ff9d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -693,14 +693,14 @@ jobs:
             - attach_workspace:
                   at: ~/nova
             - reuse-cache
+            - checkout:
+                path: ~/nova
             - add_ssh_keys
             - run:
                   name: Add GitHub to known_hosts
                   command: |
                       mkdir -p ~/.ssh
                       ssh-keyscan github.com >> ~/.ssh/known_hosts
-            - checkout:
-                  path: ~/nova
             - run:
                   name: Configure Git
                   command: |
@@ -717,14 +717,14 @@ jobs:
         environment:
             NOVA_DIR: ~/nova
         steps:
+            - checkout:
+                path: ~/nova
             - add_ssh_keys
             - run:
                   name: Add GitHub to known_hosts
                   command: |
                       mkdir -p ~/.ssh
                       ssh-keyscan github.com >> ~/.ssh/known_hosts
-            - checkout:
-                  path: ~/nova
             - run:
                   name: Configure Git
                   command: |
diff --git a/scripts/clean-docs b/scripts/clean-docs
index 86bfeb97f..9b4805899 100644
--- a/scripts/clean-docs
+++ b/scripts/clean-docs
@@ -11,10 +11,11 @@ else
     mkdir nova-docs
     cd ./nova-docs
 
-    # avoid prompt related to the HostKeyChecking
-    mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
+    # avoid prompt related to host key checking without replacing CircleCI's SSH config
+    mkdir -p ~/.ssh
+    ssh-keyscan github.com >> ~/.ssh/known_hosts
 
-    git clone $DOC_SERVICE_REPO .
+    git clone "$DOC_SERVICE_REPO" .
 fi
 
 echo ""
diff --git a/scripts/deploy-docs b/scripts/deploy-docs
index 43b9f4e19..b819d4128 100644
--- a/scripts/deploy-docs
+++ b/scripts/deploy-docs
@@ -39,10 +39,11 @@ DASHBOARDS_DOCS_PATH="./projects/dashboards/${BRANCH_PATH}"
 mkdir nova-docs
 cd ./nova-docs
 
-# avoid prompt related to the HostKeyChecking
-mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config
+# avoid prompt related to host key checking without replacing CircleCI's SSH config
+mkdir -p ~/.ssh
+ssh-keyscan github.com >> ~/.ssh/known_hosts
 
-git clone $DOC_SERVICE_REPO .
+git clone "$DOC_SERVICE_REPO" .
 
 # move bits docs
 mkdir --parents ./projects/bits