diff --git a/main.yml b/main.yml
index eff5c13..bc84091 100644
--- a/main.yml
+++ b/main.yml
@@ -1,19 +1,28 @@
 - name: Create Instances
   hosts: 127.0.0.1
   connection: local
   vars_files:
     - "vars/main.yml"
   tasks:
     - include: tasks/create-instances.yml
 
+- name: Configure Jump Server
+  hosts: c4science-jump
+  vars_files:
+    - "vars/main.yml"
+  user: centos
+  sudo: yes
+  tasks:
+    - include: tasks/configure-jump.yml
+
 - name: Configure Databases
   hosts: dbs
   vars_files:
     - "vars/main.yml"
   user: centos
   sudo: yes
   tasks:
     - include: tasks/configure-dbs.yml
   handlers:
     - include: handlers/main.yml
 
diff --git a/tasks/configure-jump.yml b/tasks/configure-jump.yml
new file mode 100644
index 0000000..cdf2d5a
--- /dev/null
+++ b/tasks/configure-jump.yml
@@ -0,0 +1,11 @@
+---
+- yum:
+    name="{{ item }}"
+    state=latest
+    update_cache=yes
+  with_items:
+    - git
+    - python-pip
+
+- pip:
+    name=ansible
diff --git a/tasks/create-instances.yml b/tasks/create-instances.yml
index 7636041..1b53fe5 100644
--- a/tasks/create-instances.yml
+++ b/tasks/create-instances.yml
@@ -1,50 +1,76 @@
 ---
 - nova_compute:
     state: present
     auth_url: "{{ auth_url }}"
     login_username: "{{ login_username }}"
     login_password: "{{ login_password }}"
     login_tenant_name: "{{ login_tenant_name }}"
     security_groups: "all"
-    name: ansible-c4science-n01
+    name: c4science-jump
+    image_name: "{{ image_name }}"
+    key_name: "{{ keypair_name }}"
+    wait_for: 500
+    auto_floating_ip: yes
+    nics:
+      - net-id: "{{ private_net}}"
+      #- net-id: "{{ public_net }}"
+    flavor_id: "{{ flavor_id }}"
+    meta:
+      hostname: c4science-jump
+      group: ansible
+  register: openstackjump
+
+- add_host: 
+    name: "{{ openstackjump.private_ip[0] }}" 
+    groupname: lbs 
+    keepalived_lbs_prio: 150
+
+- nova_compute:
+    state: present
+    auth_url: "{{ auth_url }}"
+    login_username: "{{ login_username }}"
+    login_password: "{{ login_password }}"
+    login_tenant_name: "{{ login_tenant_name }}"
+    security_groups: "all"
+    name: c4science-n01
     image_name: "{{ image_name }}"
     key_name: "{{ keypair_name }}"
     wait_for: 500
     nics:
       - net-id: "{{ private_net }}"
 #      - net-name: "{{ private_net_name }}"
     flavor_id: "{{ flavor_id }}"
     meta:
       hostname: c4science-n01
       group: ansible
   register: openstacklb1
 
 - add_host: 
     name: "{{ openstacklb1.private_ip[0] }}" 
     groupname: lbs 
     keepalived_lbs_prio: 150
 
 - nova_compute:
     state: present
     auth_url: "{{ auth_url }}"
     login_username: "{{ login_username }}"
     login_password: "{{ login_password }}"
     login_tenant_name: "{{ login_tenant_name }}"
     security_groups: "all"
-    name: ansible-c4science-db01
+    name: c4science-db01
     image_name: "{{ image_name }}"
     key_name: "{{ keypair_name }}"
     wait_for: 500
     nics:
       - net-id: "{{ private_net }}"
     flavor_id: "{{ flavor_id }}"
     meta:
       hostname: c4science-db01
       group: ansible
   register: openstackdb1
 
 - add_host: 
     name: "{{ openstackdb1.private_ip[0] }}" 
     groupname: dbs
     keepalived_lbs_prio: 150
 
diff --git a/tasks/destroy-instances.yml b/tasks/destroy-instances.yml
index cc00f87..3c9f2b5 100644
--- a/tasks/destroy-instances.yml
+++ b/tasks/destroy-instances.yml
@@ -1,38 +1,59 @@
 ---
 - nova_compute:
     state: absent
     auth_url: "{{ auth_url }}"
     login_username: "{{ login_username }}"
     login_password: "{{ login_password }}"
     login_tenant_name: "{{ login_tenant_name }}"
     security_groups: "all"
-    name: ansible-c4science-n01
+    name: c4science-jump
+    image_name: "{{ image_name }}"
+    key_name: "{{ keypair_name }}"
+    wait_for: 500
+    nics:
+      - net-id: "{{ public_net }}"
+    flavor_id: "{{ flavor_id }}"
+    meta:
+      hostname: c4science-jump
+      group: ansible
+  register: openstackjump
+
+- nova_compute:
+    state: absent
+    auth_url: "{{ auth_url }}"
+    login_username: "{{ login_username }}"
+    login_password: "{{ login_password }}"
+    login_tenant_name: "{{ login_tenant_name }}"
+    security_groups: "all"
+    name: c4science-n01
     image_name: "{{ image_name }}"
     key_name: "{{ keypair_name }}"
     wait_for: 500
     nics:
       - net-id: "{{ private_net }}"
+#      - net-name: "{{ private_net_name }}"
     flavor_id: "{{ flavor_id }}"
     meta:
       hostname: c4science-n01
       group: ansible
   register: openstacklb1
 
 - nova_compute:
     state: absent
     auth_url: "{{ auth_url }}"
     login_username: "{{ login_username }}"
     login_password: "{{ login_password }}"
     login_tenant_name: "{{ login_tenant_name }}"
     security_groups: "all"
-    name: ansible-c4science-db01
+    name: c4science-db01
     image_name: "{{ image_name }}"
     key_name: "{{ keypair_name }}"
     wait_for: 500
     nics:
       - net-id: "{{ private_net }}"
     flavor_id: "{{ flavor_id }}"
     meta:
       hostname: c4science-db01
       group: ansible
   register: openstackdb1
+