diff --git a/ignismq-core/src/main/java/com/phonepe/ignis/client/impl/AerospikeStoreClient.java b/ignismq-core/src/main/java/com/phonepe/ignis/client/impl/AerospikeStoreClient.java
index 872e5b3..0e380e3 100644
--- a/ignismq-core/src/main/java/com/phonepe/ignis/client/impl/AerospikeStoreClient.java
+++ b/ignismq-core/src/main/java/com/phonepe/ignis/client/impl/AerospikeStoreClient.java
@@ -22,8 +22,8 @@
 import com.aerospike.client.policy.*;
 import com.google.common.base.Strings;
 import com.phonepe.ignis.client.StorageClient;
-import com.phonepe.platform.aerospike.config.AerospikeConfiguration;
-import com.phonepe.platform.aerospike.config.AerospikeHost;
+import com.phonepe.aerospike.config.AerospikeConfiguration;
+import com.phonepe.aerospike.config.AerospikeHost;
 import io.dropwizard.lifecycle.Managed;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
diff --git a/ignismq-core/src/main/java/com/phonepe/ignis/consumer/MagazineConsumerTask.java b/ignismq-core/src/main/java/com/phonepe/ignis/consumer/MagazineConsumerTask.java
index 8e93072..5feaa59 100644
--- a/ignismq-core/src/main/java/com/phonepe/ignis/consumer/MagazineConsumerTask.java
+++ b/ignismq-core/src/main/java/com/phonepe/ignis/consumer/MagazineConsumerTask.java
@@ -83,6 +83,9 @@ public void run() {
                 consumeSingleMessage();
             }
             log.debug("Completed consumption for queue {}", magazine.getMagazineIdentifier());
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            log.error("Fatal!!! Consumer task interrupted for queue {}", magazine.getMagazineIdentifier(), e);
         } catch (Exception e) {
             log.error("Fatal!!! Error running consumer task...", e);
         }
diff --git a/ignismq-core/src/main/java/com/phonepe/ignis/service/AerospikeQueueService.java b/ignismq-core/src/main/java/com/phonepe/ignis/service/AerospikeQueueService.java
index bbba4e9..2f18db1 100644
--- a/ignismq-core/src/main/java/com/phonepe/ignis/service/AerospikeQueueService.java
+++ b/ignismq-core/src/main/java/com/phonepe/ignis/service/AerospikeQueueService.java
@@ -37,7 +37,7 @@
 import com.phonepe.magazine.common.MagazineData;
 import com.phonepe.magazine.scope.MagazineScope;
 import com.phonepe.magazine.util.CommonUtils;
-import com.phonepe.platform.aerospike.config.AerospikeConfiguration;
+import com.phonepe.aerospike.config.AerospikeConfiguration;
 import io.appform.functionmetrics.MonitoredFunction;
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/ignismq-core/src/main/java/com/phonepe/ignis/storage/AerospikeStorage.java b/ignismq-core/src/main/java/com/phonepe/ignis/storage/AerospikeStorage.java
index 312058c..a9f1cdc 100644
--- a/ignismq-core/src/main/java/com/phonepe/ignis/storage/AerospikeStorage.java
+++ b/ignismq-core/src/main/java/com/phonepe/ignis/storage/AerospikeStorage.java
@@ -17,7 +17,7 @@
 package com.phonepe.ignis.storage;
 
 import com.phonepe.magazine.core.StorageType;
-import com.phonepe.platform.aerospike.config.AerospikeConfiguration;
+import com.phonepe.aerospike.config.AerospikeConfiguration;
 import lombok.Getter;
 
 /**
diff --git a/ignismq-core/src/main/java/com/phonepe/ignis/utils/Utils.java b/ignismq-core/src/main/java/com/phonepe/ignis/utils/Utils.java
index 7a73c8c..2a43300 100644
--- a/ignismq-core/src/main/java/com/phonepe/ignis/utils/Utils.java
+++ b/ignismq-core/src/main/java/com/phonepe/ignis/utils/Utils.java
@@ -100,7 +100,10 @@ public static void waitForRequestsCompletion(final List<Future<Boolean>> futureL
         for (Future<Boolean> future : futureList) {
             try {
                 future.get();
-            } catch (InterruptedException | ExecutionException e) {
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw IgnisMQException.propagate(e);
+            } catch (ExecutionException e) {
                 throw IgnisMQException.propagate(e);
             }
         }
diff --git a/ignismq-core/src/test/java/com/phonepe/ignis/client/impl/AerospikeStoreClientTest.java b/ignismq-core/src/test/java/com/phonepe/ignis/client/impl/AerospikeStoreClientTest.java
index b83325b..efbd646 100644
--- a/ignismq-core/src/test/java/com/phonepe/ignis/client/impl/AerospikeStoreClientTest.java
+++ b/ignismq-core/src/test/java/com/phonepe/ignis/client/impl/AerospikeStoreClientTest.java
@@ -18,8 +18,8 @@
 
 import com.aerospike.client.IAerospikeClient;
 import com.phonepe.ignis.util.AerospikeTestBase;
-import com.phonepe.platform.aerospike.config.AerospikeConfiguration;
-import com.phonepe.platform.aerospike.config.AerospikeHost;
+import com.phonepe.aerospike.config.AerospikeConfiguration;
+import com.phonepe.aerospike.config.AerospikeHost;
 import org.junit.Test;
 
 import java.util.List;
diff --git a/ignismq-core/src/test/java/com/phonepe/ignis/storage/AerospikeStorageTest.java b/ignismq-core/src/test/java/com/phonepe/ignis/storage/AerospikeStorageTest.java
index 1d86320..4f66c9f 100644
--- a/ignismq-core/src/test/java/com/phonepe/ignis/storage/AerospikeStorageTest.java
+++ b/ignismq-core/src/test/java/com/phonepe/ignis/storage/AerospikeStorageTest.java
@@ -17,7 +17,7 @@
 package com.phonepe.ignis.storage;
 
 import com.phonepe.magazine.core.StorageType;
-import com.phonepe.platform.aerospike.config.AerospikeConfiguration;
+import com.phonepe.aerospike.config.AerospikeConfiguration;
 import org.junit.Test;
 
 import java.util.Collections;
diff --git a/ignismq-core/src/test/java/com/phonepe/ignis/util/AerospikeTestBase.java b/ignismq-core/src/test/java/com/phonepe/ignis/util/AerospikeTestBase.java
index f9a9c2c..20a4352 100644
--- a/ignismq-core/src/test/java/com/phonepe/ignis/util/AerospikeTestBase.java
+++ b/ignismq-core/src/test/java/com/phonepe/ignis/util/AerospikeTestBase.java
@@ -23,8 +23,8 @@
 import com.phonepe.ignis.service.AerospikeQueueService;
 import com.phonepe.ignis.storage.AerospikeStorage;
 import com.phonepe.ignis.storage.BaseStorage;
-import com.phonepe.platform.aerospike.config.AerospikeConfiguration;
-import com.phonepe.platform.aerospike.config.AerospikeHost;
+import com.phonepe.aerospike.config.AerospikeConfiguration;
+import com.phonepe.aerospike.config.AerospikeHost;
 import io.appform.testcontainers.aerospike.AerospikeContainerConfiguration;
 import io.appform.testcontainers.aerospike.container.AerospikeContainer;
 import lombok.extern.slf4j.Slf4j;
diff --git a/ignismq-dw-bundle/src/test/java/com/phonepe/ignis/IgnisMQBundleTest.java b/ignismq-dw-bundle/src/test/java/com/phonepe/ignis/IgnisMQBundleTest.java
index 17f2e39..127e93d 100644
--- a/ignismq-dw-bundle/src/test/java/com/phonepe/ignis/IgnisMQBundleTest.java
+++ b/ignismq-dw-bundle/src/test/java/com/phonepe/ignis/IgnisMQBundleTest.java
@@ -18,7 +18,7 @@
 
 import com.phonepe.ignis.storage.AerospikeStorage;
 import com.phonepe.ignis.storage.BaseStorage;
-import com.phonepe.platform.aerospike.config.AerospikeConfiguration;
+import com.phonepe.aerospike.config.AerospikeConfiguration;
 import io.dropwizard.Configuration;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
diff --git a/pom.xml b/pom.xml
index 6214721..3c5bb5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -324,20 +324,6 @@
                     <goals>deploy</goals>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.sonarsource.scanner.maven</groupId>
-                <artifactId>sonar-maven-plugin</artifactId>
-                <version>${maven.sonar.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>sonar-run</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>sonar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>