diff --git a/spacemk/exporters/terraform.py b/spacemk/exporters/terraform.py
index 3d55aa2..b27443a 100644
--- a/spacemk/exporters/terraform.py
+++ b/spacemk/exporters/terraform.py
@@ -1124,7 +1124,7 @@ def _map_modules_data(self, src_data: dict) -> dict:
                 segments = module.get("attributes.vcs-repo.identifier").split("/")
                 vcs_namespace = "/".join(segments[:-1])
                 vcs_repository = segments[-1]
-            elif module.get("attributes.vcs-repo.identifier"):
+            elif not self.is_gitlab and module.get("attributes.vcs-repo.identifier"):
                 segments = module.get("attributes.vcs-repo.identifier").split("/")
                 vcs_namespace = segments[0]
                 vcs_repository = segments[1]
@@ -1289,7 +1289,7 @@ def find_workspace_variable_with_invalid_name(data: dict, workspace_id: str, typ
                 segments = workspace.get("attributes.vcs-repo.identifier").split("/")
                 vcs_namespace = "/".join(segments[:-1])
                 vcs_repository = segments[-1]
-            elif workspace.get("attributes.vcs-repo.identifier"):
+            elif provider != "gitlab" and workspace.get("attributes.vcs-repo.identifier"):
                 segments = workspace.get("attributes.vcs-repo.identifier").split("/")
                 vcs_namespace = segments[0]
                 vcs_repository = segments[1]