From 76d50335fa14a76c1b35790a45602a07382b2f6a Mon Sep 17 00:00:00 2001
From: Guy Shtub <guy@scylladb.com>
Date: Wed, 9 Aug 2023 11:10:10 +0300
Subject: [PATCH] updated scylla version and removed simplestrategy

---
 CDC_Kafka_Lab/docker-compose-scylladb.yml            |  6 +++---
 Rust_CDRS/ps-logger/README.md                        |  2 +-
 Rust_CDRS/ps-logger/src/db.rs                        |  2 +-
 Rust_Scylla_Driver/chat/README.md                    |  2 +-
 Rust_Scylla_Driver/chat/src/main.rs                  |  2 +-
 Rust_Scylla_Driver/ps-logger/README.md               |  2 +-
 Rust_Scylla_Driver/ps-logger/src/db.rs               |  2 +-
 alternator/getting-started/README.md                 |  2 +-
 alternator/tictactoe_example_app/README.md           |  2 +-
 dual_writes/dual_writes.py                           |  2 +-
 flink_streaming_into_scylla/README.md                |  2 +-
 .../com/scylla/movies/FilterMoviesStreamingJob.java  |  2 +-
 iot-temperature-example/billy.cql                    |  2 +-
 kubernetes-operator-demo/cassandra-stress.yaml       | 12 ++++++------
 kubernetes-operator-demo/tests.cql                   |  4 ++--
 kubernetes-scylla/scylla-statefulset.yaml            |  2 +-
 kubernetes-university-live/cassandra-stress.yaml     |  2 +-
 mms/docker-compose-day3.yml                          |  2 +-
 mms/docker-compose-dc2.yml                           |  6 +++---
 mms/docker-compose.yml                               |  6 +++---
 mms/janusgraph/docker-compose-cql.yml                |  6 +++---
 presto/docker-compose.yml                            |  2 +-
 scylla-and-spark/dataframes/stocks.cql               |  2 +-
 .../streaming-into-scylla/create-tables.sh           |  2 +-
 .../insert_data_into_scylla+elastic.py               |  2 +-
 spark-scylla-migrator-demo/prepare_target.cql        |  2 +-
 spark-scylla-migrator-demo/sample.cql                |  2 +-
 spark3-scylla4-demo/samplespark3.cql                 |  2 +-
 spring/springdemo-custom/docker-compose-spring.yml   |  5 ++---
 spring/springdemo-custom/start-scylla-container.sh   |  6 +++---
 spring/springdemo-default/start-scylla-container.sh  |  6 +++---
 .../1_insert_TS_direct_revised.py                    |  2 +-
 32 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/CDC_Kafka_Lab/docker-compose-scylladb.yml b/CDC_Kafka_Lab/docker-compose-scylladb.yml
index 01c62976..1c2952ae 100644
--- a/CDC_Kafka_Lab/docker-compose-scylladb.yml
+++ b/CDC_Kafka_Lab/docker-compose-scylladb.yml
@@ -3,7 +3,7 @@ version: "3"
 services:
   scylla-node1:
     container_name: scylla-node1
-    image: scylladb/scylla:5.0.0
+    image: scylladb/scylla:5.2.0
     ports:
       - 9042:9042
     restart: always
@@ -11,12 +11,12 @@ services:
 
   scylla-node2:
     container_name: scylla-node2
-    image: scylladb/scylla:5.0.0
+    image: scylladb/scylla:5.2.0
     restart: always
     command: --seeds=scylla-node1,scylla-node2 --smp 1 --memory 750M --overprovisioned 1 --api-address 0.0.0.0
 
   scylla-node3:
     container_name: scylla-node3
-    image: scylladb/scylla:5.0.0
+    image: scylladb/scylla:5.2.0
     restart: always
     command: --seeds=scylla-node1,scylla-node2 --smp 1 --memory 750M --overprovisioned 1 --api-address 0.0.0.0
diff --git a/Rust_CDRS/ps-logger/README.md b/Rust_CDRS/ps-logger/README.md
index 6df17d1c..865bb649 100644
--- a/Rust_CDRS/ps-logger/README.md
+++ b/Rust_CDRS/ps-logger/README.md
@@ -4,7 +4,7 @@ Instructions for setting up a one node Scylla cluster in Docker and running an e
 ### Starting a Scylla Cluster
 To get Scylla up and running start a local scylla instance on port 9042:
 ```bash
-docker run   -p 9042:9042/tcp   --name some-scylla   --hostname some-scylla   -d scylladb/scylla:4.4.0    --smp 1 --memory=750M --overprovisioned 1
+docker run   -p 9042:9042/tcp   --name some-scylla   --hostname some-scylla   -d scylladb/scylla:5.2.0    --smp 1 --memory=750M --overprovisioned 1
 ```
 
 ### Running the RUST Application
diff --git a/Rust_CDRS/ps-logger/src/db.rs b/Rust_CDRS/ps-logger/src/db.rs
index 854f6467..f158bfb9 100644
--- a/Rust_CDRS/ps-logger/src/db.rs
+++ b/Rust_CDRS/ps-logger/src/db.rs
@@ -28,7 +28,7 @@ pub type CurrentSession = Session<SingleNode<TcpConnectionPool<NoneAuthenticator
 static CREATE_KEYSPACE_QUERY: &'static str = r#"
   CREATE KEYSPACE IF NOT EXISTS fast_logger
     WITH REPLICATION = {
-      'class': 'SimpleStrategy',
+      'class': 'NetworkTopologyStrategy',
       'replication_factor': 1
     };
 "#;
diff --git a/Rust_Scylla_Driver/chat/README.md b/Rust_Scylla_Driver/chat/README.md
index c388a437..55ca711e 100644
--- a/Rust_Scylla_Driver/chat/README.md
+++ b/Rust_Scylla_Driver/chat/README.md
@@ -8,7 +8,7 @@ An example application that demonstrates advanced topics such as prepared statem
 To get Scylla up and running start a local scylla instance on port 9042:
 
 ```bash
-docker run   -p 9042:9042/tcp   --name some-scylla   --hostname some-scylla   -d scylladb/scylla:4.5.0    --smp 1 --memory=750M --overprovisioned 1
+docker run   -p 9042:9042/tcp   --name some-scylla   --hostname some-scylla   -d scylladb/scylla:5.2.0    --smp 1 --memory=750M --overprovisioned 1
 ```
 
 ### Running the Rust Application
diff --git a/Rust_Scylla_Driver/chat/src/main.rs b/Rust_Scylla_Driver/chat/src/main.rs
index f51aefc0..2699b56e 100644
--- a/Rust_Scylla_Driver/chat/src/main.rs
+++ b/Rust_Scylla_Driver/chat/src/main.rs
@@ -7,7 +7,7 @@ use tokio::io::{stdin, AsyncBufReadExt, BufReader};
 static CREATE_KEYSPACE_QUERY: &str = r#"
   CREATE KEYSPACE IF NOT EXISTS log
     WITH REPLICATION = {
-      'class': 'SimpleStrategy',
+      'class': 'NetworkTopologyStrategy',
       'replication_factor': 1
     };
 "#;
diff --git a/Rust_Scylla_Driver/ps-logger/README.md b/Rust_Scylla_Driver/ps-logger/README.md
index b390f1df..b7581513 100644
--- a/Rust_Scylla_Driver/ps-logger/README.md
+++ b/Rust_Scylla_Driver/ps-logger/README.md
@@ -7,7 +7,7 @@ Instructions for setting up a one node Scylla cluster in Docker and running an e
 To get Scylla up and running start a local scylla instance on port 9042:
 
 ```bash
-docker run   -p 9042:9042/tcp   --name some-scylla   --hostname some-scylla   -d scylladb/scylla:4.5.0    --smp 1 --memory=750M --overprovisioned 1
+docker run   -p 9042:9042/tcp   --name some-scylla   --hostname some-scylla   -d scylladb/scylla:5.2.0    --smp 1 --memory=750M --overprovisioned 1
 ```
 
 ### Running the RUST Application
diff --git a/Rust_Scylla_Driver/ps-logger/src/db.rs b/Rust_Scylla_Driver/ps-logger/src/db.rs
index edba8e91..11b050a5 100644
--- a/Rust_Scylla_Driver/ps-logger/src/db.rs
+++ b/Rust_Scylla_Driver/ps-logger/src/db.rs
@@ -6,7 +6,7 @@ use crate::{Duration, Result, TemperatureMeasurement};
 static CREATE_KEYSPACE_QUERY: &str = r#"
   CREATE KEYSPACE IF NOT EXISTS fast_logger
     WITH REPLICATION = {
-      'class': 'SimpleStrategy',
+      'class': 'NetworkTopologyStrategy',
       'replication_factor': 1
     };
 "#;
diff --git a/alternator/getting-started/README.md b/alternator/getting-started/README.md
index 969d1f6d..019d2700 100644
--- a/alternator/getting-started/README.md
+++ b/alternator/getting-started/README.md
@@ -4,7 +4,7 @@ Instructions for setting up a one node Scylla cluster and performing some basic
 ### Starting a Scylla Cluster
 To get Scylla up and running with Alternator enabled, start a local scylla instance:
 ```bash
-docker run  --name some-scylla   --hostname some-scylla -p 8000:8000  -d scylladb/scylla:4.5.0    --smp 1 --memory=750M --overprovisioned 1 --alternator-port=8000
+docker run  --name some-scylla   --hostname some-scylla -p 8000:8000  -d scylladb/scylla:5.2.0    --smp 1 --memory=750M --overprovisioned 1 --alternator-port=8000
 ```
 
 ### Installing the Boto 3 Python library
diff --git a/alternator/tictactoe_example_app/README.md b/alternator/tictactoe_example_app/README.md
index a8216549..e14a63d6 100644
--- a/alternator/tictactoe_example_app/README.md
+++ b/alternator/tictactoe_example_app/README.md
@@ -35,7 +35,7 @@ Example:
 
 You can easily get an Alternator instance started by running the following:
 
-      docker run --name scylladb-alternator scylladb/scylla:latest --smp 1 --memory 512M --alternator-port 8000 --alternator-write-isolation always
+      docker run --name scylladb-alternator scylladb/scylla:5.2.0 --smp 1 --memory 512M --alternator-port 8000 --alternator-write-isolation always
       sleep 1m
       yourAlternatorIP="$(docker inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' scylladb-alternator)"
       # then you can run the application.py passing variable $yourAlternatorIP
diff --git a/dual_writes/dual_writes.py b/dual_writes/dual_writes.py
index facc0e52..0681c5ce 100644
--- a/dual_writes/dual_writes.py
+++ b/dual_writes/dual_writes.py
@@ -31,7 +31,7 @@ def log(message):
 
 logging.basicConfig(filename=LOG_FILE,level=logging.DEBUG,format="%(asctime)s %(message)s",datefmt="%b %d %Y %H:%M:%S")
 
-create_ks = "create keyspace if not exists dual_writes with replication = {'class' : 'SimpleStrategy', 'replication_factor' : 3};"
+create_ks = "create keyspace if not exists dual_writes with replication = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 3};"
 create_t1 = "create table if not exists dual_writes.t1 (c1 int, c2 varchar, primary key (c1) );"
 create_t2 = "create table if not exists dual_writes.t2 (c1 int, c2 varchar, primary key (c1) );"
 
diff --git a/flink_streaming_into_scylla/README.md b/flink_streaming_into_scylla/README.md
index e0b94cf5..f2d2625d 100644
--- a/flink_streaming_into_scylla/README.md
+++ b/flink_streaming_into_scylla/README.md
@@ -75,7 +75,7 @@ What to Expect
 The program creates the following schema.
 
 ```
-CREATE KEYSPACE flink_example WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '1'}  AND durable_writes = true;
+CREATE KEYSPACE flink_example WITH replication = {'class': 'NetworkTopologyStrategy', 'replication_factor': '1'}  AND durable_writes = true;
 
 CREATE TABLE flink_example.movies (
     title text PRIMARY KEY,
diff --git a/flink_streaming_into_scylla/flink-app/src/main/java/com/scylla/movies/FilterMoviesStreamingJob.java b/flink_streaming_into_scylla/flink-app/src/main/java/com/scylla/movies/FilterMoviesStreamingJob.java
index f8c4d790..c225688e 100644
--- a/flink_streaming_into_scylla/flink-app/src/main/java/com/scylla/movies/FilterMoviesStreamingJob.java
+++ b/flink_streaming_into_scylla/flink-app/src/main/java/com/scylla/movies/FilterMoviesStreamingJob.java
@@ -75,7 +75,7 @@ protected Cluster buildCluster(Cluster.Builder builder) {
 		Cluster cluster = null;
 		Session session = null;
 
-		final String CREATE_KEYSPACE = "CREATE KEYSPACE flink_example WITH replication= {'class':'SimpleStrategy', 'replication_factor':1};";
+		final String CREATE_KEYSPACE = "CREATE KEYSPACE flink_example WITH replication= {'class':'NetworkTopologyStrategy', 'replication_factor':1};";
 		final String CREATE_TABLE = "CREATE TABLE flink_example.movies (title text PRIMARY KEY, genres list<text>);";
 
 		try{
diff --git a/iot-temperature-example/billy.cql b/iot-temperature-example/billy.cql
index b1692d02..750c8563 100644
--- a/iot-temperature-example/billy.cql
+++ b/iot-temperature-example/billy.cql
@@ -1,4 +1,4 @@
-CREATE KEYSPACE billy WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '1'}  AND durable_writes = true;
+CREATE KEYSPACE billy WITH replication = {'class': 'NetworkTopologyStrategy', 'replication_factor': '1'}  AND durable_writes = true;
 
 CREATE TABLE billy.readings (
     sensor_id int,
diff --git a/kubernetes-operator-demo/cassandra-stress.yaml b/kubernetes-operator-demo/cassandra-stress.yaml
index fac0fc16..792ed289 100644
--- a/kubernetes-operator-demo/cassandra-stress.yaml
+++ b/kubernetes-operator-demo/cassandra-stress.yaml
@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: cassandra-stress
-        image: scylladb/scylla:4.0.0
+        image: scylladb/scylla:5.2.0
         command:
           - "/bin/bash"
           - "-c"
@@ -53,7 +53,7 @@ spec:
     spec:
       containers:
       - name: cassandra-stress
-        image: scylladb/scylla:4.0.0
+        image: scylladb/scylla:5.2.0
         command:
           - "/bin/bash"
           - "-c"
@@ -94,7 +94,7 @@ spec:
     spec:
       containers:
         - name: cassandra-stress
-          image: scylladb/scylla:4.0.0
+          image: scylladb/scylla:5.2.0
           command:
             - "/bin/bash"
             - "-c"
@@ -135,7 +135,7 @@ spec:
     spec:
       containers:
         - name: cassandra-stress
-          image: scylladb/scylla:4.0.0
+          image: scylladb/scylla:5.2.0
           command:
             - "/bin/bash"
             - "-c"
@@ -176,7 +176,7 @@ spec:
     spec:
       containers:
         - name: cassandra-stress
-          image: scylladb/scylla:4.0.0
+          image: scylladb/scylla:5.2.0
           command:
             - "/bin/bash"
             - "-c"
@@ -217,7 +217,7 @@ spec:
     spec:
       containers:
         - name: cassandra-stress
-          image: scylladb/scylla:4.0.0
+          image: scylladb/scylla:5.2.0
           command:
             - "/bin/bash"
             - "-c"
diff --git a/kubernetes-operator-demo/tests.cql b/kubernetes-operator-demo/tests.cql
index 5a6e374f..42c26507 100644
--- a/kubernetes-operator-demo/tests.cql
+++ b/kubernetes-operator-demo/tests.cql
@@ -1,6 +1,6 @@
-CREATE KEYSPACE thespace WITH replication = {'class': 'SimpleStrategy', 'replication_factor' : 2};
+CREATE KEYSPACE thespace WITH replication = {'class': 'NetworkTopologyStrategy', 'replication_factor' : 2};
 
 CREATE TABLE planets (
     name text PRIMARY KEY,
     size int
-);
\ No newline at end of file
+);
diff --git a/kubernetes-scylla/scylla-statefulset.yaml b/kubernetes-scylla/scylla-statefulset.yaml
index d04b9d52..6888059f 100644
--- a/kubernetes-scylla/scylla-statefulset.yaml
+++ b/kubernetes-scylla/scylla-statefulset.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: scylla
-          image: scylladb/scylla:2.0.0
+          image: scylladb/scylla:5.2.0
           imagePullPolicy: IfNotPresent
           args: ["--seeds", "scylla-0.scylla.default.svc.cluster.local"]
           ports:
diff --git a/kubernetes-university-live/cassandra-stress.yaml b/kubernetes-university-live/cassandra-stress.yaml
index 0b0aebcf..932c1828 100644
--- a/kubernetes-university-live/cassandra-stress.yaml
+++ b/kubernetes-university-live/cassandra-stress.yaml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: cassandra-stress
-        image: scylladb/scylla:4.4.2
+        image: scylladb/scylla:5.2.0
         command:
           - "/bin/bash"
           - "-c"
diff --git a/mms/docker-compose-day3.yml b/mms/docker-compose-day3.yml
index f607473e..b0a15ca2 100644
--- a/mms/docker-compose-day3.yml
+++ b/mms/docker-compose-day3.yml
@@ -4,7 +4,7 @@ services:
 
   scylla-node7:
     container_name: scylla-node7
-    image: scylladb/scylla:5.1.0
+    image: scylladb/scylla:5.2.0
     restart: always
     command: --seeds=scylla-node1,scylla-node2 --smp 1 --memory 750M --overprovisioned 1 --api-address 0.0.0.0
     volumes:
diff --git a/mms/docker-compose-dc2.yml b/mms/docker-compose-dc2.yml
index 1d84be11..bfb8032f 100644
--- a/mms/docker-compose-dc2.yml
+++ b/mms/docker-compose-dc2.yml
@@ -4,7 +4,7 @@ services:
 
   scylla-node4:
     container_name: scylla-node4
-    image: scylladb/scylla:5.1.0
+    image: scylladb/scylla:5.2.0
     restart: always
     command: --seeds=scylla-node1,scylla-node4 --smp 1 --memory 750M --overprovisioned 1 --api-address 0.0.0.0
     volumes:
@@ -15,7 +15,7 @@ services:
 
   scylla-node5:
     container_name: scylla-node5
-    image: scylladb/scylla:5.1.0
+    image: scylladb/scylla:5.2.0
     restart: always
     command: --seeds=scylla-node1,scylla-node4 --smp 1 --memory 750M --overprovisioned 1 --api-address 0.0.0.0
     volumes:
@@ -26,7 +26,7 @@ services:
 
   scylla-node6:
     container_name: scylla-node6
-    image: scylladb/scylla:5.1.0
+    image: scylladb/scylla:5.2.0
     restart: always
     command: --seeds=scylla-node1,scylla-node4 --smp 1 --memory 750M --overprovisioned 1 --api-address 0.0.0.0
     volumes:
diff --git a/mms/docker-compose.yml b/mms/docker-compose.yml
index 0753acf7..4f500c46 100644
--- a/mms/docker-compose.yml
+++ b/mms/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   scylla-node1:
     container_name: scylla-node1
-    image: scylladb/scylla:5.1.0
+    image: scylladb/scylla:5.2.0
     restart: always
     command: --seeds=scylla-node1,scylla-node2 --smp 1 --memory 750M --overprovisioned 1 --api-address 0.0.0.0
     volumes:
@@ -16,7 +16,7 @@ services:
 
   scylla-node2:
     container_name: scylla-node2
-    image: scylladb/scylla:5.1.0
+    image: scylladb/scylla:5.2.0
     restart: always
     command: --seeds=scylla-node1,scylla-node2 --smp 1 --memory 750M --overprovisioned 1 --api-address 0.0.0.0
     volumes:
@@ -27,7 +27,7 @@ services:
 
   scylla-node3:
     container_name: scylla-node3
-    image: scylladb/scylla:5.1.0
+    image: scylladb/scylla:5.2.0
     restart: always
     command: --seeds=scylla-node1,scylla-node2 --smp 1 --memory 750M --overprovisioned 1 --api-address 0.0.0.0
     volumes:
diff --git a/mms/janusgraph/docker-compose-cql.yml b/mms/janusgraph/docker-compose-cql.yml
index b087a267..6d65fdbc 100644
--- a/mms/janusgraph/docker-compose-cql.yml
+++ b/mms/janusgraph/docker-compose-cql.yml
@@ -19,7 +19,7 @@ services:
 
   scylla-node1:
     container_name: scylla-node1
-    image: scylladb/scylla:4.5.0
+    image: scylladb/scylla:5.2.0
     restart: always
     command: --seeds=scylla-node1,scylla-node2 --smp 1 --memory 750M --overprovisioned 1 --api-address 0.0.0.0
     networks:
@@ -27,7 +27,7 @@ services:
 
   scylla-node2:
     container_name: scylla-node2
-    image: scylladb/scylla:4.5.0
+    image: scylladb/scylla:5.2.0
     restart: always
     command: --seeds=scylla-node1,scylla-node2 --smp 1 --memory 750M --overprovisioned 1 --api-address 0.0.0.0
     networks:
@@ -35,7 +35,7 @@ services:
 
   scylla-node3:
     container_name: scylla-node3
-    image: scylladb/scylla:4.5.0
+    image: scylladb/scylla:5.2.0
     restart: always
     command: --seeds=scylla-node1,scylla-node2 --smp 1 --memory 750M --overprovisioned 1 --api-address 0.0.0.0
     networks:
diff --git a/presto/docker-compose.yml b/presto/docker-compose.yml
index a7bd33bf..ec76b20c 100644
--- a/presto/docker-compose.yml
+++ b/presto/docker-compose.yml
@@ -33,7 +33,7 @@ services:
 
   scylladb:
     restart: always
-    image: scylladb/scylla:5.1.7
+    image: scylladb/scylla:5.2.0
     ports:
       - 9042:9042
     volumes:
diff --git a/scylla-and-spark/dataframes/stocks.cql b/scylla-and-spark/dataframes/stocks.cql
index 60a5d96c..22a07905 100644
--- a/scylla-and-spark/dataframes/stocks.cql
+++ b/scylla-and-spark/dataframes/stocks.cql
@@ -1,5 +1,5 @@
 CREATE KEYSPACE stocks
-  WITH REPLICATION = {'class': 'SimpleStrategy', 'replication_factor': 1};
+  WITH REPLICATION = {'class': 'NetworkTopologyStrategy', 'replication_factor': 1};
 
 CREATE TABLE stocks.stocks
   (symbol text,
diff --git a/scylla-and-spark/streaming-into-scylla/create-tables.sh b/scylla-and-spark/streaming-into-scylla/create-tables.sh
index d78fb9f4..2506e3b6 100755
--- a/scylla-and-spark/streaming-into-scylla/create-tables.sh
+++ b/scylla-and-spark/streaming-into-scylla/create-tables.sh
@@ -4,6 +4,6 @@ set -e
 set -x
 
 docker-compose exec scylla cqlsh -e "DROP KEYSPACE IF EXISTS quotes;"
-docker-compose exec scylla cqlsh -e "CREATE KEYSPACE quotes WITH REPLICATION = {'class': 'SimpleStrategy', 'replication_factor': 1};"
+docker-compose exec scylla cqlsh -e "CREATE KEYSPACE quotes WITH REPLICATION = {'class': 'NetworkTopologyStrategy', 'replication_factor': 1};"
 docker-compose exec scylla cqlsh -e "CREATE TABLE quotes.quotes (symbol TEXT, timestamp TIMESTAMP, day TIMESTAMP, latest_price DOUBLE, previous_close DOUBLE, latest_volume BIGINT, PRIMARY KEY ((symbol), timestamp));"
 docker-compose exec scylla cqlsh -e "CREATE MATERIALIZED VIEW quotes.quotes_by_day AS SELECT * FROM quotes.quotes WHERE symbol IS NOT NULL AND timestamp IS NOT NULL PRIMARY KEY ((day), symbol, timestamp)"
diff --git a/scylla_elasticsearch_integration/insert_data_into_scylla+elastic.py b/scylla_elasticsearch_integration/insert_data_into_scylla+elastic.py
index 6496c6b6..23246e4f 100644
--- a/scylla_elasticsearch_integration/insert_data_into_scylla+elastic.py
+++ b/scylla_elasticsearch_integration/insert_data_into_scylla+elastic.py
@@ -27,7 +27,7 @@
 
 
 ## Define KS + Table
-create_ks = "CREATE KEYSPACE IF NOT EXISTS catalog WITH replication = {'class' : 'SimpleStrategy', 'replication_factor' : 3};"
+create_ks = "CREATE KEYSPACE IF NOT EXISTS catalog WITH replication = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 3};"
 create_t1 = "CREATE TABLE IF NOT EXISTS catalog.apparel (sku text, brand text, group text, sub_group text, color text, size text, gender text, PRIMARY KEY ((sku),color,size));"
 
 
diff --git a/spark-scylla-migrator-demo/prepare_target.cql b/spark-scylla-migrator-demo/prepare_target.cql
index 96d0e543..d8c7491b 100644
--- a/spark-scylla-migrator-demo/prepare_target.cql
+++ b/spark-scylla-migrator-demo/prepare_target.cql
@@ -1,4 +1,4 @@
-CREATE KEYSPACE mykeyspace WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1};
+CREATE KEYSPACE mykeyspace WITH REPLICATION = { 'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1};
 
 use mykeyspace;
 
diff --git a/spark-scylla-migrator-demo/sample.cql b/spark-scylla-migrator-demo/sample.cql
index cbbdceea..8740645e 100644
--- a/spark-scylla-migrator-demo/sample.cql
+++ b/spark-scylla-migrator-demo/sample.cql
@@ -1,4 +1,4 @@
-CREATE KEYSPACE mykeyspace WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1};
+CREATE KEYSPACE mykeyspace WITH REPLICATION = { 'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1};
 
 use mykeyspace;
 
diff --git a/spark3-scylla4-demo/samplespark3.cql b/spark3-scylla4-demo/samplespark3.cql
index 8615fe1f..a9923769 100644
--- a/spark3-scylla4-demo/samplespark3.cql
+++ b/spark3-scylla4-demo/samplespark3.cql
@@ -1,4 +1,4 @@
-CREATE KEYSPACE myOwnKeyspace WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1};
+CREATE KEYSPACE myOwnKeyspace WITH REPLICATION = { 'class' : 'NetworkTopologyStrategy', 'replication_factor' : 1};
 
 use myOwnKeyspace;
 
diff --git a/spring/springdemo-custom/docker-compose-spring.yml b/spring/springdemo-custom/docker-compose-spring.yml
index abc19a22..80489085 100644
--- a/spring/springdemo-custom/docker-compose-spring.yml
+++ b/spring/springdemo-custom/docker-compose-spring.yml
@@ -3,7 +3,7 @@ version: "3"
 services:
   scylla-node1:
     container_name: scylla-node1
-    image: scylladb/scylla:5.1.0
+    image: scylladb/scylla:5.2.0
     ports:
       - 9042:9042
     restart: always
@@ -11,13 +11,12 @@ services:
 
   scylla-node2:
     container_name: scylla-node2
-    image: scylladb/scylla:5.1.0
+    image: scylladb/scylla:5.2.0
     restart: always
     command: --seeds=scylla-node1,scylla-node2 --smp 1 --memory 750M --overprovisioned 1 --api-address 0.0.0.0
 
   scylla-node3:
     container_name: scylla-node3
-    image: scylladb/scylla:5.1.0
     restart: always
     command: --seeds=scylla-node1,scylla-node2 --smp 1 --memory 750M --overprovisioned 1 --api-address 0.0.0.0
 
diff --git a/spring/springdemo-custom/start-scylla-container.sh b/spring/springdemo-custom/start-scylla-container.sh
index f9417b83..72969daa 100755
--- a/spring/springdemo-custom/start-scylla-container.sh
+++ b/spring/springdemo-custom/start-scylla-container.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 set -x
 
-docker pull scylladb/scylla:latest
+docker pull scylladb/scylla:5.2.0
 
 docker rm scylla-spring
 
 #EXPOSE 10000 9042 9160 9180 7000 7001 22
 #--hostname some-scylla
-docker run --name scylla-spring -p 10000:10000 -p 24:22 -p 7000:7000 -p 7001:7001 -p 9180:9180 -p 9042:9042 -p 9160:9160 -d scylladb/scylla:latest
+docker run --name scylla-spring -p 10000:10000 -p 24:22 -p 7000:7000 -p 7001:7001 -p 9180:9180 -p 9042:9042 -p 9160:9160 -d scylladb/scylla:5.2.0
 
-docker start scylla-spring
\ No newline at end of file
+docker start scylla-spring
diff --git a/spring/springdemo-default/start-scylla-container.sh b/spring/springdemo-default/start-scylla-container.sh
index f9417b83..72969daa 100755
--- a/spring/springdemo-default/start-scylla-container.sh
+++ b/spring/springdemo-default/start-scylla-container.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 set -x
 
-docker pull scylladb/scylla:latest
+docker pull scylladb/scylla:5.2.0
 
 docker rm scylla-spring
 
 #EXPOSE 10000 9042 9160 9180 7000 7001 22
 #--hostname some-scylla
-docker run --name scylla-spring -p 10000:10000 -p 24:22 -p 7000:7000 -p 7001:7001 -p 9180:9180 -p 9042:9042 -p 9160:9160 -d scylladb/scylla:latest
+docker run --name scylla-spring -p 10000:10000 -p 24:22 -p 7000:7000 -p 7001:7001 -p 9180:9180 -p 9042:9042 -p 9160:9160 -d scylladb/scylla:5.2.0
 
-docker start scylla-spring
\ No newline at end of file
+docker start scylla-spring
diff --git a/time_series_python_code/1_insert_TS_direct_revised.py b/time_series_python_code/1_insert_TS_direct_revised.py
index 4dc7c38a..77678a3e 100644
--- a/time_series_python_code/1_insert_TS_direct_revised.py
+++ b/time_series_python_code/1_insert_TS_direct_revised.py
@@ -22,7 +22,7 @@
 IP_C1 = opts.C1.split(',')
 
 # Creating the DB Schema - need to run the CREATE MATERIALIZED VIEW manually using cqlsh, since it does not work from the script
-create_ks = "create keyspace if not exists direct_ts with replication = {'class' : 'SimpleStrategy', 'replication_factor' : 3};"
+create_ks = "create keyspace if not exists direct_ts with replication = {'class' : 'NetworkTopologyStrategy', 'replication_factor' : 3};"
 create_t1 = "create table if not exists direct_ts.data_points (rack_id text, sensor_id text, curr_epoch timestamp, value int, primary key ((rack_id,sensor_id),curr_epoch)) WITH CLUSTERING ORDER BY (curr_epoch DESC);"
 # create_2i = "CREATE INDEX data_points_curr_epoch_idx ON direct_ts.data_points (curr_epoch); CREATE INDEX data_points_value_idx ON direct_ts.data_points (value);"