diff --git a/src/renderer/src/components/steps/PrepareFolder.jsx b/src/renderer/src/components/steps/PrepareFolder.jsx
index 7bbcd63e..466daca5 100644
--- a/src/renderer/src/components/steps/PrepareFolder.jsx
+++ b/src/renderer/src/components/steps/PrepareFolder.jsx
@@ -108,7 +108,7 @@ const PrepareFolder = React.forwardRef(({ onNext }, ref) => {
           onClick={() => onClickCopyLogs()}
           color={WHITE}
           backgroundColor={RICH_BLACK}
-          classes={`${commonStyles.buttonPadding} cy-action-next`}
+          classes={`${commonStyles.buttonPadding} cy-action-donwload-logs`}
         />
         {folderPreparedError
           ? <Button
diff --git a/src/renderer/src/components/steps/configure-services/ConfigureEnvVarsTemplateAndPlugins.jsx b/src/renderer/src/components/steps/configure-services/ConfigureEnvVarsTemplateAndPlugins.jsx
index 006b2bbf..482bd4dc 100644
--- a/src/renderer/src/components/steps/configure-services/ConfigureEnvVarsTemplateAndPlugins.jsx
+++ b/src/renderer/src/components/steps/configure-services/ConfigureEnvVarsTemplateAndPlugins.jsx
@@ -18,10 +18,10 @@ function ConfigureEnvVarsTemplateAndPlugins ({
   const [currentComponent, setCurrentComponent] = useState(<></>)
 
   useEffect(() => {
-    if (configuredServices !== null) {
+    if (configuredServices !== null && !serviceSelected) {
       setServiceSelected(configuredServices[0])
     }
-  }, [configuredServices])
+  }, [configuredServices, !serviceSelected])
 
   function handleChangeTemplateEnvVars (event) {
     return handleChangeTemplateForm(event, serviceSelected.template, serviceSelected.name)
diff --git a/src/renderer/src/components/steps/configure-services/ConfigureServices.jsx b/src/renderer/src/components/steps/configure-services/ConfigureServices.jsx
index 1ad7db6c..0ef94dc0 100644
--- a/src/renderer/src/components/steps/configure-services/ConfigureServices.jsx
+++ b/src/renderer/src/components/steps/configure-services/ConfigureServices.jsx
@@ -19,6 +19,7 @@ const ConfigureServices = React.forwardRef(({ onNext }, ref) => {
 
   useEffect(() => {
     if (services.length > 0) {
+      const tmpServices = []
       let tmpTemplateForms = {}
       let tmpTemplateValidations = {}
       let tmpTemplateValidForm = {}
@@ -60,8 +61,9 @@ const ConfigureServices = React.forwardRef(({ onNext }, ref) => {
         tmpObj.validForm = tmpTemplateValidForm
         tmpObj.updatedAt = new Date().toISOString()
         tmpObj.plugins = []
+        tmpServices.push(tmpObj)
       })
-      setConfiguredServices([...configuredServices, tmpObj])
+      setConfiguredServices(tmpServices)
     }
   }, [services])