diff --git a/README.md b/README.md
index 642ae70..b317e05 100644
--- a/README.md
+++ b/README.md
@@ -97,12 +97,7 @@ curl https://sh.rustup.rs -sSf | sh -s -- -y
 3. Switch to nightly.
 _Note:_ As of now, only a specific nightly version is supported due to a deprecated feature that a dependency is using.   
 ```
-rustup override set nightly-2021-05-11
-```
-4. Select specific versions for some dependencies (due to these dependencies breaking some nightly features)
-```
-cargo update -p proc-macro2 --precise 1.0.28
-cargo update -p packed_simd_2 --precise 0.3.4
+rustup override set nightly-2022-07-24
 ```
 6. `cargo build`
    
diff --git a/ansible/roles/e2e-common/tasks/main.yml b/ansible/roles/e2e-common/tasks/main.yml
index a5cf98f..812bd86 100644
--- a/ansible/roles/e2e-common/tasks/main.yml
+++ b/ansible/roles/e2e-common/tasks/main.yml
@@ -44,7 +44,7 @@
   shell: |
     . /etc/profile
     . $HOME/.cargo/env
-    rustup override set nightly-2021-05-11
+    rustup override set nightly-2022-07-24
 
 - name: Switch to nightly rust for main server code
   args:
@@ -52,7 +52,7 @@
   shell: |
     . /etc/profile
     . $HOME/.cargo/env
-    rustup override set nightly-2021-05-11
+    rustup override set nightly-2022-07-24
 
 # Rust nightly is breaking our build of Subtle (sub-package of dalek-cryptography), thats why we set a specific nightly above.
 
@@ -102,15 +102,15 @@
   args:
     chdir: "{{ e2e_remote_base_dir }}/{{ e2e_framework_dir }}/rofl_train_client"
 
-- name: Select version of old dependency # For compatibility with nightly build
-  shell: |
-    . $HOME/.cargo/env
-    cargo update -p quote --precise 1.0.9
-    cargo update -p syn --precise 1.0.72
-    cargo update -p proc-macro2 --precise 1.0.28
-    cargo update -p packed_simd_2 --precise 0.3.4
-  args:
-    chdir: "{{ e2e_remote_base_dir }}/{{ e2e_framework_dir }}/rofl_crypto"
+#- name: Select version of old dependency # For compatibility with nightly build
+#  shell: |
+#    . $HOME/.cargo/env
+#    cargo update -p quote --precise 1.0.9
+#    cargo update -p syn --precise 1.0.72
+#    cargo update -p proc-macro2 --precise 1.0.28
+#    cargo update -p packed_simd_2 --precise 0.3.4
+#  args:
+#    chdir: "{{ e2e_remote_base_dir }}/{{ e2e_framework_dir }}/rofl_crypto"
 
 - name: Build Cargo crypto # for microbenchmarks, e2e will recompile based on the given config
   environment:
diff --git a/ansible/roles/e2e-job/tasks/main.yml b/ansible/roles/e2e-job/tasks/main.yml
index e10639f..763b181 100644
--- a/ansible/roles/e2e-job/tasks/main.yml
+++ b/ansible/roles/e2e-job/tasks/main.yml
@@ -120,7 +120,7 @@
 #    src: "{{ e2e.log_dir }}"
 #    dest: "{{ current_results_dir }}"
 #    recursive: yes
-#  when: is_cur_exp_finished
+  when: is_cur_exp_finished
 
 - name: Fetch Benchlog Results (if experiment done)
   delegate_to: localhost
@@ -131,7 +131,7 @@
 #    src: "/benchlog"
 #    dest: "{{ current_results_dir }}"
 #    recursive: yes
-#  when: is_cur_exp_finished
+  when: is_cur_exp_finished
 
 - name: Fetch Client Results (if experiment done)
   delegate_to: localhost
diff --git a/rofl_crypto/Cargo.toml b/rofl_crypto/Cargo.toml
index 68ff830..4ae6dcb 100644
--- a/rofl_crypto/Cargo.toml
+++ b/rofl_crypto/Cargo.toml
@@ -10,25 +10,25 @@ name = "rofl_crypto"
 crate-type = ["rlib", "dylib"]
 
 [dependencies]
-curve25519-dalek = { version = "1.1.3", default-features = false, features = ["std", "avx2_backend"], optional = false }
+curve25519-dalek = {  package = "curve25519-dalek-ng", version = "4", default-features = false, features = ["std", "avx2_backend"], optional = false }
 
 proc-macro2 = { version = "1.0.28" }
 #NOTE mlei: cannot be higher otherwise wont compile
 packed_simd = { version = "0.3.4", package = "packed_simd_2" }
 
 libc = "0.2.48"
-bulletproofs="1.0.4"
+bulletproofs="4.0.0"
 fixed = "0.3.1"
-rand = "0.5"
+rand = "0.8"
 byteorder = "1.3.1"
 serde_json = "1.0"
 bincode = "1.3.1"
 hashbrown = "0.1"
 rayon = "1.0.3"
 criterion = "0.3.4"
-merlin = "1.0.3"
+merlin = "3"
 num_cpus = "1.10.0"
-sha3 = "0.8"
+sha3 = "0.9.1"
 serde = "1"
 failure = "0.1"
 clear_on_drop = "0.2"
diff --git a/rofl_service/Cargo.toml b/rofl_service/Cargo.toml
index bf6b1f7..0719b99 100644
--- a/rofl_service/Cargo.toml
+++ b/rofl_service/Cargo.toml
@@ -7,12 +7,12 @@ edition = "2018"
 
 [dependencies]
 rofl_crypto= { path = "../rofl_crypto" }
-curve25519-dalek = { version = "1.1.3", default-features = false, features = ["std", "avx2_backend"], optional = false }
-bulletproofs="1.0.4"
+curve25519-dalek = {  package = "curve25519-dalek-ng", version = "4", default-features = false, features = ["std", "avx2_backend"], optional = false }
+bulletproofs="4.0.0"
 rayon = "1.0.3"
 num_cpus = "1.10.0"
-rand = "0.7.3"
-rand_distr = "0.2.2"
+rand = "0.8"
+rand_distr = "0.4.3"
 prost = "0.7.0"
 tonic = {version="0.4.0", features = ["prost"]}
 http = "0.2"
diff --git a/rofl_train_client/trainservice/service.py b/rofl_train_client/trainservice/service.py
index a189e52..4622ea9 100644
--- a/rofl_train_client/trainservice/service.py
+++ b/rofl_train_client/trainservice/service.py
@@ -35,11 +35,11 @@
 
 import grpc
 
-# from analysis_wrapper import AnalysisClientWrapper
+from analysis_wrapper import AnalysisClientWrapper
 
 NUM_FLOATS_PER_BLOCK = 10000
 
-# client = AnalysisClientWrapper(args.config, args.dataset_path)
+client = AnalysisClientWrapper(args.config, args.dataset_path)
 
 
 class FLClientTrainService(flservice_pb2_grpc.FLClientTrainServiceServicer):
@@ -106,5 +106,5 @@ def serve(service, port):
 
 if __name__ == '__main__':
     logging.basicConfig()
-    # serve(FLClientTrainService(), args.port)
-    serve(MockCIFARLFLClientTrainService(), args.port)
\ No newline at end of file
+    serve(FLClientTrainService(), args.port)
+    # serve(MockCIFARLFLClientTrainService(), args.port)
\ No newline at end of file