diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..cffeab6
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,26 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 16
+      uses: actions/setup-java@v2
+      with:
+        java-version: '16'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
diff --git a/Dockerfile b/Dockerfile
index bee11aa..39016d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Start with a base image containing Java runtime
-FROM openjdk:11
+FROM openjdk:16.0
 
 # Add Maintainer Info
 MAINTAINER Rajeev Kumar Singh <callicoder@gmail.com>
diff --git a/Readme.md b/Readme.md
index f7ab273..ddf0067 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,3 +1,5 @@
+[![Java CI with Maven](https://github.com/dotnes/spring-boot-websocket-chat-demo/actions/workflows/maven.yml/badge.svg)](https://github.com/dotnes/spring-boot-websocket-chat-demo/actions/workflows/maven.yml)
+
 ## Spring Boot WebSocket Chat Appplication
 
 You can checkout the live version of the application at https://spring-ws-chat.herokuapp.com/
diff --git a/pom.xml b/pom.xml
index ae5ce36..b75439c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.5</version>
+		<version>2.5.8</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>