diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml
index eb211df4c..3aba8edf8 100644
--- a/.github/workflows/maven-ci.yml
+++ b/.github/workflows/maven-ci.yml
@@ -40,26 +40,26 @@ jobs:
     steps:
 
     - name: Checkout Code
-      uses: actions/checkout@master
+      uses: actions/checkout@v2
       with:
         # Disabling shallow clone for improving relevancy of SonarQube reporting
         fetch-depth: 0
 
     - name: Set up JDK 11
-      uses: actions/setup-java@master
+      uses: actions/setup-java@v2
       with:
         java-version: 11
         distribution: 'adopt'
 
     - name: Cache SonarCloud packages
-      uses: actions/cache@master
+      uses: actions/cache@v2
       with:
         path: ~/.sonar/cache
         key: ${{ runner.os }}-sonar
         restore-keys: ${{ runner.os }}-sonar
 
     - name: Cache Maven dependencies
-      uses: actions/cache@master
+      uses: actions/cache@v2
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/maven-pr-builder.yml b/.github/workflows/maven-pr-builder.yml
index bf54e2eb3..a6a98bb68 100644
--- a/.github/workflows/maven-pr-builder.yml
+++ b/.github/workflows/maven-pr-builder.yml
@@ -38,16 +38,16 @@ jobs:
 
     steps:
     - name: Checkout Code
-      uses: actions/checkout@master
+      uses: actions/checkout@v2
     
     - name: Set up JDK 11
-      uses: actions/setup-java@master
+      uses: actions/setup-java@v2
       with:
         java-version: 11
         distribution: 'adopt'
     
     - name: Cache Maven Dependecies
-      uses: actions/cache@master
+      uses: actions/cache@v2
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/reactor/src/main/java/com/iluwatar/reactor/app/App.java b/reactor/src/main/java/com/iluwatar/reactor/app/App.java
index 7eaa7c747..0f9b25f6a 100644
--- a/reactor/src/main/java/com/iluwatar/reactor/app/App.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/app/App.java
@@ -131,9 +131,10 @@ public class App {
      * log requests.
      */
     reactor
-        .registerChannel(tcpChannel(6666, loggingHandler))
-        .registerChannel(tcpChannel(6667, loggingHandler))
-        .registerChannel(udpChannel(6668, loggingHandler))
+        .registerChannel(tcpChannel(16666, loggingHandler))
+        .registerChannel(tcpChannel(16667, loggingHandler))
+        .registerChannel(udpChannel(16668, loggingHandler))
+        .registerChannel(udpChannel(16669, loggingHandler))
         .start();
   }
 
diff --git a/reactor/src/main/java/com/iluwatar/reactor/app/AppClient.java b/reactor/src/main/java/com/iluwatar/reactor/app/AppClient.java
index 4009fdb16..253e4bacf 100644
--- a/reactor/src/main/java/com/iluwatar/reactor/app/AppClient.java
+++ b/reactor/src/main/java/com/iluwatar/reactor/app/AppClient.java
@@ -63,10 +63,10 @@ public class AppClient {
    */
   public void start() throws IOException {
     LOGGER.info("Starting logging clients");
-    service.execute(new TcpLoggingClient("Client 1", 6666));
-    service.execute(new TcpLoggingClient("Client 2", 6667));
-    service.execute(new UdpLoggingClient("Client 3", 6668));
-    service.execute(new UdpLoggingClient("Client 4", 6668));
+    service.execute(new TcpLoggingClient("Client 1", 16666));
+    service.execute(new TcpLoggingClient("Client 2", 16667));
+    service.execute(new UdpLoggingClient("Client 3", 16668));
+    service.execute(new UdpLoggingClient("Client 4", 16669));
   }
 
   /**
@@ -114,7 +114,7 @@ public class AppClient {
 
     @Override
     public void run() {
-      try (Socket socket = new Socket(InetAddress.getLocalHost(), serverPort)) {
+      try (var socket = new Socket(InetAddress.getLocalHost(), serverPort)) {
         var outputStream = socket.getOutputStream();
         var writer = new PrintWriter(outputStream);
         sendLogRequests(writer, socket.getInputStream());