diff --git a/deployment-e2e/molecule/prepare.yml b/deployment-e2e/molecule/prepare.yml
index 0892e6d5..8a17f873 100644
--- a/deployment-e2e/molecule/prepare.yml
+++ b/deployment-e2e/molecule/prepare.yml
@@ -11,8 +11,3 @@
           - rsyslog
     - shell: service rsyslog start
     - shell: groupadd docker && chgrp docker /var/run/docker.sock
-    - name: Copy keystore file
-      copy:
-        src: ../../e2e-commons/keystore.json
-        dest: /tmp/keystore.json
-        mode: '0755'
diff --git a/deployment-e2e/molecule/ultimate-amb/molecule.yml b/deployment-e2e/molecule/ultimate-amb/molecule.yml
index a6bf6d09..c046a33b 100644
--- a/deployment-e2e/molecule/ultimate-amb/molecule.yml
+++ b/deployment-e2e/molecule/ultimate-amb/molecule.yml
@@ -7,7 +7,7 @@ platforms:
       - ultimate
       - amb
     children:
-      - oracle
+      - oracle_swarm
     image: ubuntu:16.04
     privileged: true
     network_mode: host
@@ -21,8 +21,8 @@ provisioner:
   inventory:
     host_vars:
       oracle-amb-host:
-        ORACLE_VALIDATOR_ADDRESS: "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
-        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
+        ORACLE_VALIDATOR_KEYSTORE_PATH: "../../../e2e-commons/keystore_ultimate.json"
+        ORACLE_VALIDATOR_KEYSTORE_PASSWORD: "12345678"
 verifier:
   name: testinfra
 scenario: