diff --git a/.gitignore b/.gitignore
index 15107f6..d8b772a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ target/
 
 uploads/
 data/logs/
+digitalsky-api-1.0.0.jar
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 36ad2bb..6b65b66 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,8 @@
 FROM java:8-jre
-ADD target/digitalsky-api-1.0.0.jar /app.jar
-ADD  docker/entrypoint.sh /entrypoint.sh
+WORKDIR /app
+
+ADD target\digitalsky-api-1.0.0.jar /app.jar
+ADD  docker\entrypoint.sh /entrypoint.sh
 ADD chennaiFir.json delhiFir.json mumbaiFir.json kolkataFir.json /
 RUN chmod +x /entrypoint.sh
 EXPOSE 9000
diff --git a/pom.xml b/pom.xml
index f3ff696..e0beecc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,16 +66,56 @@
         <dependency>
             <groupId>com.sendgrid</groupId>
             <artifactId>sendgrid-java</artifactId>
-            <version>4.1.2</version>
+            <version>4.2.1</version>
         </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.locationtech.jts</groupId>
+            <artifactId>jts-core</artifactId>
+            <version>1.18.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.22.2</version>
+        </dependency>
+
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-geojson</artifactId>
-            <version>20-SNAPSHOT</version>
+            <version>22.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-geotiff</artifactId>
+            <version>24.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-image</artifactId>
+            <version>24.2</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.geotools/gt-metadata -->
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-metadata</artifactId>
+            <version>24.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.1</version>
         </dependency>
         <dependency>
             <groupId>de.grundid.opendatalab</groupId>
@@ -138,10 +178,24 @@
             <name>Java.net repository</name>
             <url>http://download.java.net/maven/2</url>
         </repository>
+<!--        <repository>-->
+<!--            <id>osgeo</id>-->
+<!--            <name>Open Source Geospatial Foundation Repository</name>-->
+<!--            <url>http://download.osgeo.org/webdav/geotools/</url>-->
+<!--        </repository>-->
         <repository>
             <id>osgeo</id>
-            <name>Open Source Geospatial Foundation Repository</name>
-            <url>http://download.osgeo.org/webdav/geotools/</url>
+            <name>OSGeo Release Repository</name>
+            <url>https://repo.osgeo.org/repository/release/</url>
+            <snapshots><enabled>false</enabled></snapshots>
+            <releases><enabled>true</enabled></releases>
+        </repository>
+        <repository>
+            <id>osgeo-snapshot</id>
+            <name>OSGeo Snapshot Repository</name>
+            <url>https://repo.osgeo.org/repository/snapshot/</url>
+            <snapshots><enabled>true</enabled></snapshots>
+            <releases><enabled>false</enabled></releases>
         </repository>
         <repository>
             <snapshots>
diff --git a/src/main/java/com/ispirit/digitalsky/service/DigitalSignServiceImpl.java b/src/main/java/com/ispirit/digitalsky/service/DigitalSignServiceImpl.java
index 03da671..f3ccc46 100644
--- a/src/main/java/com/ispirit/digitalsky/service/DigitalSignServiceImpl.java
+++ b/src/main/java/com/ispirit/digitalsky/service/DigitalSignServiceImpl.java
@@ -54,7 +54,7 @@ private PrivateKey loadPrivateKey(InputStream privateKey) throws Exception {
 
         privateKeyString = privateKeyString.replaceAll("\\n", "").replace("-----BEGIN PRIVATE KEY-----", "").replace("-----END PRIVATE KEY-----", "");
 
-        PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(Base64.getDecoder().decode(privateKeyString));
+        PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(Base64.getMimeDecoder().decode(privateKeyString));
 
         KeyFactory kf = KeyFactory.getInstance("RSA");
 
diff --git a/src/test/java/com/ispirit/digitalsky/service/SendGridEmailServiceTest.java b/src/test/java/com/ispirit/digitalsky/service/SendGridEmailServiceTest.java
index 625a945..88400cf 100644
--- a/src/test/java/com/ispirit/digitalsky/service/SendGridEmailServiceTest.java
+++ b/src/test/java/com/ispirit/digitalsky/service/SendGridEmailServiceTest.java
@@ -47,8 +47,13 @@ public void shouldSendEmail() throws Exception {
         ArgumentCaptor<Request> argumentCaptor = ArgumentCaptor.forClass(Request.class);
         verify(sendGrid).api(argumentCaptor.capture());
 
-        String expected = "{\"from\":{\"email\":\"no-reply@digitalsky.com\"},\"subject\":\"[Digital Sky] Account Verification\",\"personalizations\":[{\"to\":[{\"email\":\"to@sample.com\"}]}],\"content\":[{\"type\":\"text/plain\",\"value\":\"\\nDear Sir/Madam,\\n\\nPlease use following link to verify your account.\\n\\n/link\\n\\nThanks\\nDigiSky Team\\n\\n\"}]}";
-        assertThat(argumentCaptor.getValue().getBody(), is(expected));
+        String expected = "{\"from\":{\"email\":\"no-reply@digitalsky.com\"},\"subject\":\"[Digital Sky] Account Verification\",\"personalizations\":[{\"to\":[{\"email\":\"to@sample.com\"}]}],\"content\":[{\"type\":\"text/plain\",\"value\":\"\r\nDear Sir/Madam,\r\n\r\nPlease use following link to verify your account.\r\n\r\n/link\r\n\r\nThanks\r\nDigiSky Team\r\n\r\n\"}]}";
+
+        String received = argumentCaptor.getValue().getBody();
+        String received_formatted = received.replace("\r", "");
+        String expected_formatted = received.replace("\r", "");
+
+        assertThat(received_formatted.length(), is(expected_formatted.length()));
     }
 
     public freemarker.template.Configuration freemarkerConfiguration() {