diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
index de83060742..e7659c8bf3 100644
--- a/.github/workflows/client.yml
+++ b/.github/workflows/client.yml
@@ -138,7 +138,7 @@ jobs:
         --env APPSMITH_REDIS_URL=redis://localhost:6379 \
         --env APPSMITH_ENCRYPTION_PASSWORD=password \
         --env APPSMITH_ENCRYPTION_SALT=salt \
-        appsmith/appsmith-server:latest
+        appsmith/appsmith-server:release
 
     - name: Installing Yarn serve
       run: |
diff --git a/app/client/README.md b/app/client/README.md
index dbbdec4dc2..b795585608 100755
--- a/app/client/README.md
+++ b/app/client/README.md
@@ -80,4 +80,6 @@ This section has moved here: https://facebook.github.io/create-react-app/docs/de
 
 This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
 
+### Cypress tests via Github Actions
 
+The cypress tests run via Github actions pull the `release` Docker image of the server to run as a service locally. This is to ensure that we don't face any network flakiness during tests.
\ No newline at end of file
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PluginServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PluginServiceImpl.java
index 8e33e15764..47e421d18f 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PluginServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PluginServiceImpl.java
@@ -308,7 +308,7 @@ public class PluginServiceImpl extends BaseService<PluginRepository, Plugin, Str
                             // Remove this pluginId from the cache so it is tried again next time.
                             formCache.remove(pluginId)
                     )
-                    .onErrorMap(Exceptions::unwrap)
+                    .onErrorReturn(new HashMap())
                     .cache();
 
             Mono<Map> resourceMono = Mono.zip(formMono, editorMono)
@@ -391,7 +391,7 @@ public class PluginServiceImpl extends BaseService<PluginRepository, Plugin, Str
                             .getResourceAsStream(resourcePath);
 
                     if (resourceAsStream == null) {
-                        return Mono.error(new AppsmithException(AppsmithError.PLUGIN_LOAD_FORM_JSON_FAIL, "Form Resource not found"));
+                        return Mono.error(new AppsmithException(AppsmithError.PLUGIN_LOAD_FORM_JSON_FAIL, "form resource " + resourcePath + " not found"));
                     }
 
                     try {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PluginServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PluginServiceTest.java
index ff345ebe57..5973799c2e 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PluginServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/PluginServiceTest.java
@@ -4,11 +4,14 @@ import com.appsmith.external.models.ActionConfiguration;
 import com.appsmith.external.models.ActionExecutionResult;
 import com.appsmith.external.models.DatasourceConfiguration;
 import com.appsmith.external.plugins.PluginExecutor;
+import com.appsmith.server.exceptions.AppsmithError;
+import com.appsmith.server.exceptions.AppsmithException;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.annotation.DirtiesContext;
@@ -16,7 +19,11 @@ import org.springframework.test.context.junit4.SpringRunner;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -27,6 +34,9 @@ public class PluginServiceTest {
     @MockBean
     PluginExecutor pluginExecutor;
 
+    @Autowired
+    PluginService pluginService;
+
     @Before
     public void setup() {
         Mockito.when(this.pluginExecutor.execute(Mockito.any(), Mockito.any(), Mockito.any()))
@@ -44,4 +54,48 @@ public class PluginServiceTest {
                 })
                 .verifyComplete();
     }
+
+    /*
+     * The Mockito.spy used in the tests below is not implemented correctly. The spies seem to be sharing data across the
+     * tests. Refer to: https://dzone.com/articles/how-to-mock-spring-bean-version-2 on implementing this correctly
+     */
+    
+    // The datasource form config is mandatory for plugins. Hence we expect an error when that file is not present
+    @Test
+    public void getPluginFormWithNullFormConfig() {
+        PluginService pluginSpy = Mockito.spy(pluginService);
+
+        Mockito.when(pluginSpy.loadPluginResource(Mockito.anyString(), eq("form.json")))
+                .thenReturn(Mono.error(new AppsmithException(AppsmithError.PLUGIN_LOAD_FORM_JSON_FAIL)));
+        Mockito.when(pluginSpy.loadPluginResource(Mockito.anyString(), eq("editor.json")))
+                .thenReturn(Mono.error(new AppsmithException(AppsmithError.PLUGIN_LOAD_FORM_JSON_FAIL)));
+
+        Mono<Map> formConfig = pluginSpy.getFormConfig("random-plugin-id");
+        StepVerifier.create(formConfig)
+                .expectError(AppsmithException.class)
+                .verify();
+    }
+
+    // The editor form config is not mandatory for plugins. The function should return successfully even if it's not present
+    @Test
+    public void getPluginFormWithNullEditorConfig() {
+        PluginService pluginSpy = Mockito.spy(pluginService);
+
+        Map formMap = new HashMap();
+        formMap.put("form", new Object());
+
+        Mockito.when(pluginSpy.loadPluginResource(Mockito.anyString(), eq("form.json")))
+                .thenReturn(Mono.just(formMap));
+        Mockito.when(pluginSpy.loadPluginResource(Mockito.anyString(), eq("editor.json")))
+                .thenReturn(Mono.error(new AppsmithException(AppsmithError.PLUGIN_LOAD_FORM_JSON_FAIL)));
+
+        Mono<Map> formConfig = pluginSpy.getFormConfig("random-plugin-id");
+        StepVerifier.create(formConfig)
+                .assertNext(form -> {
+                    assertThat(form).isNotNull();
+                    assertThat(form.get("form")).isNotNull();
+                    assertThat(form.get("editor")).isNull();
+                })
+                .verifyComplete();
+    }
 }