diff --git a/.ci/.autoRedirect b/.ci/.autoRedirect
index a2eb11b6e14817671b50bcf2b5969815cce86a56..4e145579886f091e2665c8e3084619556e331933 100644
--- a/.ci/.autoRedirect
+++ b/.ci/.autoRedirect
@@ -14,7 +14,12 @@
             }
         });
     }
-    UrlExists('https://r3-core.pages.uni.lu/howto-cards-internal/index.html', function(status){
+
+    // define URLs
+    var internalURL = 'https://r3-core.pages.uni.lu/howto-cards-internal';
+    var externalURL = 'https://r3.pages.uni.lu/howto-cards';
+
+    UrlExists(internalURL+'/index.html', function(status){
         var s = window.location.href;
         var pathArray = s.split('?');
 
@@ -28,22 +33,38 @@
         if(status === 200){
             // internal pages
             if (sub.length > 0) {
-                UrlExists('https://r3-core.pages.uni.lu/howto-cards-internal/stable/internal/'+sub, function(status){
-                    // redirect if card is actually internal and exists
-                    if (status == 200) {
-                        window.location.href = 'https://r3-core.pages.uni.lu/howto-cards-internal/stable/internal/'+sub;
+                UrlExists(internalURL+'/stable/internal/'+sub, function(status){
+                    if (status == 200) { // if sub-card is internal in the internal directory and exists
+                        window.location.href = internalURL+'/stable/internal/'+sub;
                     } else {
-                        window.location.href = 'https://r3-core.pages.uni.lu/howto-cards-internal/stable/external/'+sub;
+                        UrlExists(internalURL+'/stable/external/'+sub, function(status){
+                            if (status == 200) { // if sub-card is internal in the external directory and exists
+                                window.location.href = internalURL+'/stable/external/'+sub;
+                            } else {
+                                window.location.href = internalURL+'/404.html';
+                            }
+                        });
                     }
                 });
             } else {
-                window.location.href = 'https://r3-core.pages.uni.lu/howto-cards-internal/stable/'+sub;
+                UrlExists(internalURL+'/stable', function(status){
+                    if (status == 200) { // if card is internal and exists
+                        window.location.href = internalURL+'/stable';
+                    } else {
+                        window.location.href = internalURL+'/404.html';
+                    }
+                });
             }
-
+        // external pages
         } else {
-            // external pages
             if (sub.length > 0) { sub = 'external/'+sub; }
-            window.location.href = 'https://r3.pages.uni.lu/howto-cards/stable/'+sub;
+            UrlExists(externalURL+'/stable/'+sub, function(status){
+                if (status == 200) { // if sub-car is internal and exists
+                    window.location.href = externalURL+'/stable/'+sub;
+                } else {
+                    window.location.href = externalURL+'/404.html';
+                }
+            });
         }
     });
     </script>