diff --git a/devstack/gate_hook.sh b/devstack/gate_hook.sh
index 2bc0f3af..03db2128 100755
--- a/devstack/gate_hook.sh
+++ b/devstack/gate_hook.sh
@@ -18,9 +18,16 @@
 # Install freezer devstack integration
 #export DEVSTACK_LOCAL_CONFIG="enable_plugin freezer-api https://git.openstack.org/openstack/freezer-api"
 
-export DEVSTACK_GATE_TEMPEST_REGEX="freezer_tempest_plugin.tests.freezer_api"
+# export DEVSTACK_GATE_TEMPEST_REGEX="freezer_tempest_plugin.tests.freezer_api"
 
-export PROJECTS="openstack/python-freezerclient $PROJECTS"
+# export PROJECTS="openstack/python-freezerclient $PROJECTS"
 
 # Invoke default behavior.
 # $BASE/new/devstack-gate/devstack-vm-gate.sh
+echo "Start of Post gate Hook"
+
+# Link the log file so it will be collected by the CI system
+if [ -n "$BASE" ] && [ -d "$BASE/logs" ]; then
+  sudo ln -sf $FREEZER_API_LOG_DIR/freezer-api.log $BASE/logs/freezer-api-post.log
+  sudo ln -sf /home/tempest/.freezer/freezer.log $BASE/logs/freezer.log
+fi
\ No newline at end of file
diff --git a/playbooks/legacy/freezer-api-centos-7/post.yaml b/playbooks/legacy/freezer-api-centos-7/post.yaml
index 9156dff2..a3b5b305 100644
--- a/playbooks/legacy/freezer-api-centos-7/post.yaml
+++ b/playbooks/legacy/freezer-api-centos-7/post.yaml
@@ -77,4 +77,16 @@
           - --include=/logs/**
           - --include=*/
           - --exclude=*
-          - --prune-empty-dirs
\ No newline at end of file
+          - --prune-empty-dirs
+
+    - name: Copy freezer-api.log to logs
+      synchronize:
+        src: '/opt/stack/new/logs/freezer-api.log'
+        dest: '{{ zuul.executor.log_root }}/freezer_api.log'
+        mode: pull
+        copy_links: true
+        verify_host: true
+        rsync_opts:
+          - --include=*
+
+
diff --git a/playbooks/legacy/freezer-api-centos-7/run.yaml b/playbooks/legacy/freezer-api-centos-7/run.yaml
index bd219145..a4127431 100644
--- a/playbooks/legacy/freezer-api-centos-7/run.yaml
+++ b/playbooks/legacy/freezer-api-centos-7/run.yaml
@@ -64,6 +64,11 @@
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
 
+          function post_test_hook {
+              bash -xe $BASE/new/freezer-api/devstack/gate_hook.sh
+          }
+          export -f post_test_hook
+
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/freezer-api-opensuse-423/post.yaml b/playbooks/legacy/freezer-api-opensuse-423/post.yaml
index 9156dff2..6dadf4d9 100644
--- a/playbooks/legacy/freezer-api-opensuse-423/post.yaml
+++ b/playbooks/legacy/freezer-api-opensuse-423/post.yaml
@@ -77,4 +77,15 @@
           - --include=/logs/**
           - --include=*/
           - --exclude=*
-          - --prune-empty-dirs
\ No newline at end of file
+          - --prune-empty-dirs
+
+    - name: Copy freezer-api.log to logs
+      synchronize:
+        src: '/opt/stack/new/logs/freezer-api.log'
+        dest: '{{ zuul.executor.log_root }}/freezer_api.log'
+        mode: pull
+        copy_links: true
+        verify_host: true
+        rsync_opts:
+          - --include=*
+
diff --git a/playbooks/legacy/freezer-api-opensuse-423/run.yaml b/playbooks/legacy/freezer-api-opensuse-423/run.yaml
index 641562f2..b2f92a0e 100644
--- a/playbooks/legacy/freezer-api-opensuse-423/run.yaml
+++ b/playbooks/legacy/freezer-api-opensuse-423/run.yaml
@@ -51,7 +51,7 @@
           export PROJECTS="openstack/freezer-web-ui $PROJECTS"
           export PROJECTS="openstack/freezer $PROJECTS"
           export PROJECTS="openstack/python-freezerclient $PROJECTS"
-           export PROJECTS="openstack/freezer-tempest-plugin $PROJECTS"
+          export PROJECTS="openstack/freezer-tempest-plugin $PROJECTS"
           # tempest config
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_REGEX="freezer_tempest_plugin.tests.freezer_api"
@@ -64,6 +64,11 @@
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
 
+          function post_test_hook {
+              bash -xe $BASE/new/freezer-api/devstack/gate_hook.sh
+          }
+          export -f post_test_hook
+
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/freezer-api-ubuntu-xenial/post.yaml b/playbooks/legacy/freezer-api-ubuntu-xenial/post.yaml
index 9156dff2..3f095305 100644
--- a/playbooks/legacy/freezer-api-ubuntu-xenial/post.yaml
+++ b/playbooks/legacy/freezer-api-ubuntu-xenial/post.yaml
@@ -77,4 +77,14 @@
           - --include=/logs/**
           - --include=*/
           - --exclude=*
-          - --prune-empty-dirs
\ No newline at end of file
+          - --prune-empty-dirs
+
+    - name: Copy freezer-api.log to logs
+      synchronize:
+        src: '/opt/stack/new/logs/freezer-api.log'
+        dest: '{{ zuul.executor.log_root }}/freezer_api.log'
+        mode: pull
+        copy_links: true
+        verify_host: true
+        rsync_opts:
+          - --include=*
diff --git a/playbooks/legacy/freezer-api-ubuntu-xenial/run.yaml b/playbooks/legacy/freezer-api-ubuntu-xenial/run.yaml
index 830b576c..609d8d36 100644
--- a/playbooks/legacy/freezer-api-ubuntu-xenial/run.yaml
+++ b/playbooks/legacy/freezer-api-ubuntu-xenial/run.yaml
@@ -64,6 +64,11 @@
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
 
+          function post_test_hook {
+              bash -xe $BASE/new/freezer-api/devstack/gate_hook.sh
+          }
+          export -f post_test_hook
+
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'