diff --git a/ui/components/integrations/s3/s3-integration-form.tsx b/ui/components/integrations/s3/s3-integration-form.tsx
index 3c5e95212b..534b377fc1 100644
--- a/ui/components/integrations/s3/s3-integration-form.tsx
+++ b/ui/components/integrations/s3/s3-integration-form.tsx
@@ -15,7 +15,7 @@ import { CustomInput } from "@/components/ui/custom";
 import { CustomLink } from "@/components/ui/custom/custom-link";
 import { Form } from "@/components/ui/form";
 import { FormButtons } from "@/components/ui/form/form-buttons";
-import { getAWSCredentialsTemplateBucketLinks } from "@/lib";
+import { getAWSCredentialsTemplateLinks } from "@/lib";
 import { AWSCredentialsRole } from "@/types";
 import {
   editS3IntegrationFormSchema,
@@ -258,9 +258,9 @@ export const S3IntegrationForm = ({
       const bucketName = form.getValues("bucket_name") || "";
       const externalId =
         form.getValues("external_id") || session?.tenantId || "";
-      const templateLinks = getAWSCredentialsTemplateBucketLinks(
-        bucketName,
+      const templateLinks = getAWSCredentialsTemplateLinks(
         externalId,
+        bucketName,
       );
 
       return (
diff --git a/ui/components/providers/workflow/forms/base-credentials-form.tsx b/ui/components/providers/workflow/forms/base-credentials-form.tsx
index 4dd06bbed9..94a2965c1a 100644
--- a/ui/components/providers/workflow/forms/base-credentials-form.tsx
+++ b/ui/components/providers/workflow/forms/base-credentials-form.tsx
@@ -7,7 +7,7 @@ import { Control } from "react-hook-form";
 import { CustomButton } from "@/components/ui/custom";
 import { Form } from "@/components/ui/form";
 import { useCredentialsForm } from "@/hooks/use-credentials-form";
-import { getAWSCredentialsTemplateScanLinks } from "@/lib";
+import { getAWSCredentialsTemplateLinks } from "@/lib";
 import { ProviderCredentialFields } from "@/lib/provider-credentials/provider-credential-fields";
 import { requiresBackButton } from "@/lib/provider-helpers";
 import {
@@ -62,7 +62,7 @@ export const BaseCredentialsForm = ({
     successNavigationUrl,
   });
 
-  const templateLinks = getAWSCredentialsTemplateScanLinks(externalId);
+  const templateLinks = getAWSCredentialsTemplateLinks(externalId);
 
   return (
     <Form {...form}>
diff --git a/ui/lib/external-urls.ts b/ui/lib/external-urls.ts
index 8c5e30cd67..c38f1a3574 100644
--- a/ui/lib/external-urls.ts
+++ b/ui/lib/external-urls.ts
@@ -38,25 +38,15 @@ export const getProviderHelpText = (provider: string) => {
   }
 };
 
-export const getAWSCredentialsTemplateScanLinks = (externalId: string) => {
-  return {
-    cloudformation:
-      "https://github.com/prowler-cloud/prowler/blob/master/permissions/templates/cloudformation/prowler-scan-role.yml",
-    cloudformationQuickLink: `https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/quickcreate?templateURL=https%3A%2F%2Fprowler-cloud-public.s3.eu-west-1.amazonaws.com%2Fpermissions%2Ftemplates%2Faws%2Fcloudformation%2Fprowler-scan-role.yml&stackName=ProwlerScanRole&param_ExternalId=${externalId}`,
-    terraform:
-      "https://github.com/prowler-cloud/prowler/blob/master/permissions/templates/terraform/main.tf",
-  };
-};
-
-export const getAWSCredentialsTemplateBucketLinks = (
-  bucketName: string,
+export const getAWSCredentialsTemplateLinks = (
   externalId: string,
+  bucketName?: string,
 ) => {
   return {
     cloudformation:
       "https://github.com/prowler-cloud/prowler/blob/master/permissions/templates/cloudformation/prowler-scan-role.yml",
-    cloudformationQuickLink: `https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/quickcreate?templateURL=https%3A%2F%2Fprowler-cloud-public.s3.eu-west-1.amazonaws.com%2Fpermissions%2Ftemplates%2Faws%2Fcloudformation%2Fprowler-scan-role-with-s3-integration.yml&stackName=ProwlerScanS3Integration&param_AccountId=232136659152&param_IAMPrincipal=role%2Fprowler*&param_ExternalId=${externalId}&param_S3IntegrationBucketName=${bucketName}`,
+    cloudformationQuickLink: `https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/quickcreate?templateURL=https%3A%2F%2Fprowler-cloud-public.s3.eu-west-1.amazonaws.com%2Fpermissions%2Ftemplates%2Faws%2Fcloudformation%2Fprowler-scan-role.yml&stackName=Prowler&param_ExternalId=${externalId}${bucketName ? `&param_EnableS3Integration=true&param_S3IntegrationBucketName=${bucketName}` : ""}`,
     terraform:
-      "https://github.com/prowler-cloud/prowler/blob/master/permissions/templates/terraform/main.tf",
+      "https://github.com/prowler-cloud/prowler/tree/master/permissions/templates/terraform",
   };
 };