diff --git a/roles/stepupgateway/tasks/main.yml b/roles/stepupgateway/tasks/main.yml
index 0aad3749f..52f24b95a 100644
--- a/roles/stepupgateway/tasks/main.yml
+++ b/roles/stepupgateway/tasks/main.yml
@@ -111,6 +111,12 @@
     path: "/root/01-gateway-db_migrate.sh"
     state: absent
 
+- name: Put logout.php in public
+  template:
+    src: "logout.php.j2"
+    dest: "{{ current_release_appdir }}/public/logout.php"
+    mode: "444"
+
 - meta: flush_handlers
 
 - name: Include post installation tasks
diff --git a/roles/stepupgateway/templates/logout.php.j2 b/roles/stepupgateway/templates/logout.php.j2
new file mode 100644
index 000000000..ffcf5369d
--- /dev/null
+++ b/roles/stepupgateway/templates/logout.php.j2
@@ -0,0 +1,45 @@
+<?php
+
+// This script removes the gateway session cookie and destroys the server-side gateway session data
+// It is a hotfix for https://www.pivotaltracker.com/story/show/186912795
+
+// The name of the session cookie
+$cookie_name='sess_gateway';
+
+// The domain used for the gateway session cookie, this is the gateway's vhost name
+$cookie_domain='.{{ gateway_vhost_name }}';
+
+// The URL to redirect the user to after logout
+$redirect_url='{{ gateway_logout_redirect_url }}';
+
+openlog("GW-LOGOUT", 0, LOG_LOCAL0);
+
+// Remove cookie and destroy the php session when present.
+if (isset($_COOKIE[$cookie_name])) {
+  syslog(LOG_NOTICE, "Cookie $cookie_name is present");
+  $id = $_COOKIE[$cookie_name];
+  syslog(LOG_NOTICE, "Destroying session $id");
+  session_name($cookie_name);
+  session_id($id);
+  session_start();
+  session_destroy();
+  session_commit();
+
+  syslog(LOG_NOTICE, "Removing session cookie");
+  setcookie(
+    $cookie_name, // name
+    "", // value
+    time() - 3600, // expire / options
+    "/", // path
+    $cookie_domain, // domain
+    true, // secure
+    true // httponly
+  );
+} else {
+  syslog(LOG_NOTICE, "Cookie $cookie_name is not present");
+}
+
+// Redirect to
+header("Location: $redirect_url", true, 302);
+
+closelog();
diff --git a/roles/stepupra/templates/parameters.yml.j2 b/roles/stepupra/templates/parameters.yml.j2
index 729578090..7df5fb0e2 100644
--- a/roles/stepupra/templates/parameters.yml.j2
+++ b/roles/stepupra/templates/parameters.yml.j2
@@ -55,7 +55,7 @@ parameters:
     asset_version: {{ appversion_sha }}
 
     logout_redirect_url:
-{% for key, value in logout_redirect_url.items() %}
+{% for key, value in ra_logout_redirect_url.items() %}
       {{ key }}: {{ value }}
 {% endfor %}