diff --git a/app/server/appsmith-plugins/mongoPlugin/plugin.properties b/app/server/appsmith-plugins/mongoPlugin/plugin.properties
new file mode 100644
index 0000000000..d9575483c0
--- /dev/null
+++ b/app/server/appsmith-plugins/mongoPlugin/plugin.properties
@@ -0,0 +1,5 @@
+plugin.id=mongo-plugin
+plugin.class=com.external.plugins.MongoPlugin
+plugin.version=1.0-SNAPSHOT
+plugin.provider=tech@appsmith.com
+plugin.dependencies=
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/mongoPlugin/pom.xml b/app/server/appsmith-plugins/mongoPlugin/pom.xml
index 6fb1791e43..52925e9cc8 100644
--- a/app/server/appsmith-plugins/mongoPlugin/pom.xml
+++ b/app/server/appsmith-plugins/mongoPlugin/pom.xml
@@ -23,23 +23,19 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.pf4j</groupId>
             <artifactId>pf4j-spring</artifactId>
-            <version>0.5.0</version>
+            <version>0.6.0</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.appsmith</groupId>
             <artifactId>interfaces</artifactId>
             <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -54,6 +50,14 @@
             <version>3.11.1</version>
         </dependency>
 
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
@@ -74,28 +78,34 @@
         </dependency>
 
     </dependencies>
-
+    
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.2</version>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
                 <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Plugin-Id>${plugin.id}</Plugin-Id>
-                            <Plugin-Class>${plugin.class}</Plugin-Class>
-                            <Plugin-Version>${plugin.version}</Plugin-Version>
-                            <Plugin-Provider>${plugin.provider}</Plugin-Provider>
-                            <Plugin-Dependencies>${plugin.dependencies}</Plugin-Dependencies>
-                        </manifestEntries>
-                    </archive>
+                    <minimizeJar>false</minimizeJar>
+                    <transformers>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <manifestEntries>
+                                <Plugin-Id>${plugin.id}</Plugin-Id>
+                                <Plugin-Class>${plugin.class}</Plugin-Class>
+                                <Plugin-Version>${plugin.version}</Plugin-Version>
+                                <Plugin-Provider>${plugin.provider}</Plugin-Provider>
+                            </manifestEntries>
+                        </transformer>
+                    </transformers>
                 </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/app/server/appsmith-plugins/postgresPlugin/plugin.properties b/app/server/appsmith-plugins/postgresPlugin/plugin.properties
new file mode 100644
index 0000000000..bfb0b59873
--- /dev/null
+++ b/app/server/appsmith-plugins/postgresPlugin/plugin.properties
@@ -0,0 +1,5 @@
+plugin.id=postgres-plugin
+plugin.class=com.external.plugins.PostgresPlugin
+plugin.version=1.0-SNAPSHOT
+plugin.provider=tech@appsmith.com
+plugin.dependencies=
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/postgresPlugin/pom.xml b/app/server/appsmith-plugins/postgresPlugin/pom.xml
index 5b6cfa4602..359193b386 100644
--- a/app/server/appsmith-plugins/postgresPlugin/pom.xml
+++ b/app/server/appsmith-plugins/postgresPlugin/pom.xml
@@ -23,23 +23,19 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.pf4j</groupId>
             <artifactId>pf4j-spring</artifactId>
-            <version>0.5.0</version>
+            <version>0.6.0</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.appsmith</groupId>
             <artifactId>interfaces</artifactId>
             <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -53,6 +49,15 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <version>42.2.12</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -78,30 +83,37 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <version>3.1.0</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.2</version>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
                 <configuration>
-                    <archive>
+                    <minimizeJar>false</minimizeJar>
+                    <transformers>
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                         <manifestEntries>
                             <Plugin-Id>${plugin.id}</Plugin-Id>
                             <Plugin-Class>${plugin.class}</Plugin-Class>
                             <Plugin-Version>${plugin.version}</Plugin-Version>
                             <Plugin-Provider>${plugin.provider}</Plugin-Provider>
-                            <Plugin-Dependencies>${plugin.dependencies}</Plugin-Dependencies>
                         </manifestEntries>
-                    </archive>
+                    </transformer>
+                    </transformers>
                 </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/app/server/appsmith-plugins/rapidApiPlugin/plugin.properties b/app/server/appsmith-plugins/rapidApiPlugin/plugin.properties
new file mode 100644
index 0000000000..0cbda26980
--- /dev/null
+++ b/app/server/appsmith-plugins/rapidApiPlugin/plugin.properties
@@ -0,0 +1,5 @@
+plugin.id=rapidapi-plugin
+plugin.class=com.external.plugins.RapidApiPlugin
+plugin.version=1.0-SNAPSHOT
+plugin.provider=tech@appsmith.com
+plugin.dependencies=
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/rapidApiPlugin/pom.xml b/app/server/appsmith-plugins/rapidApiPlugin/pom.xml
index 32621c6e67..53b788e079 100644
--- a/app/server/appsmith-plugins/rapidApiPlugin/pom.xml
+++ b/app/server/appsmith-plugins/rapidApiPlugin/pom.xml
@@ -4,6 +4,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.2.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+
     <groupId>com.external.plugins</groupId>
     <artifactId>rapidApiPlugin</artifactId>
     <version>1.0-SNAPSHOT</version>
@@ -23,23 +30,19 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.pf4j</groupId>
             <artifactId>pf4j-spring</artifactId>
-            <version>0.5.0</version>
+            <version>0.6.0</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.appsmith</groupId>
             <artifactId>interfaces</artifactId>
             <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -55,8 +58,20 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
+    <!--
+    This doesn't use the maven-shade-plugin because it inherits from spring-boot-starter-parent
+    for it's dependency on webclient. This is a normal compile.
+    -->
     <build>
         <plugins>
             <plugin>
diff --git a/app/server/appsmith-plugins/restApiPlugin/plugin.properties b/app/server/appsmith-plugins/restApiPlugin/plugin.properties
new file mode 100644
index 0000000000..0d4b9e0aa8
--- /dev/null
+++ b/app/server/appsmith-plugins/restApiPlugin/plugin.properties
@@ -0,0 +1,5 @@
+plugin.id=restapi-plugin
+plugin.class=com.external.plugins.RestApiPlugin
+plugin.version=1.0-SNAPSHOT
+plugin.provider=tech@appsmith.com
+plugin.dependencies=
\ No newline at end of file
diff --git a/app/server/appsmith-plugins/restApiPlugin/pom.xml b/app/server/appsmith-plugins/restApiPlugin/pom.xml
index bc166ba399..84f6cda457 100644
--- a/app/server/appsmith-plugins/restApiPlugin/pom.xml
+++ b/app/server/appsmith-plugins/restApiPlugin/pom.xml
@@ -30,23 +30,19 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.pf4j</groupId>
             <artifactId>pf4j-spring</artifactId>
-            <version>0.5.0</version>
+            <version>0.6.0</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.appsmith</groupId>
             <artifactId>interfaces</artifactId>
             <version>1.0-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -68,6 +64,13 @@
         </dependency>
 
         <!-- Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-test</artifactId>
@@ -84,6 +87,10 @@
 
     </dependencies>
 
+    <!--
+        This doesn't use the maven-shade-plugin because it inherits from spring-boot-starter-parent
+        for it's dependency on webclient. This is a normal compile.
+    -->
     <build>
         <plugins>
             <plugin>
diff --git a/app/server/appsmith-server/pom.xml b/app/server/appsmith-server/pom.xml
index 6bd5e430c1..c5cbb9ad0b 100644
--- a/app/server/appsmith-server/pom.xml
+++ b/app/server/appsmith-server/pom.xml
@@ -114,11 +114,6 @@
             <artifactId>de.flapdoodle.embed.mongo</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
diff --git a/app/server/build.sh b/app/server/build.sh
index b3c0cbf5f4..442f4a482e 100755
--- a/app/server/build.sh
+++ b/app/server/build.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Remove previous dist directory
+rm -rf dist/
 
 # Build the code. $@ accepts all the parameters from the input command line and uses it in the maven build command
 mvn clean package "$@"
@@ -12,7 +13,7 @@ mkdir -p dist/plugins
 cp ./appsmith-server/target/server-1.0-SNAPSHOT.jar dist/
 
 # Copy all the plugins
-cp ./appsmith-plugins/*/target/*.jar dist/plugins/
+rsync -av --exclude "original-*.jar" ./appsmith-plugins/*/target/*.jar dist/plugins/