diff --git a/components/blocks/SubCompanyTiles.tsx b/components/blocks/SubCompanyTiles.tsx
index 5131b549e..1ac3bda01 100644
--- a/components/blocks/SubCompanyTiles.tsx
+++ b/components/blocks/SubCompanyTiles.tsx
@@ -114,33 +114,21 @@ export function SubCompanyTiles(props: SubCompanyTilesProps) {
             const positionClass = bgPositionClasses[index % bgPositionClasses.length];
             const animationClass = animationClasses[index % animationClasses.length];
             
-            return (
-              <motion.div 
-                key={index}
-                variants={itemVariants}
-                className="h-full"
-              >
-                <CardWrapper 
-                  {...wrapperProps}
-                  className={`group relative overflow-hidden aspect-[4/3] flex flex-col justify-center items-center shadow-xl transition-all duration-500 bg-neutral-dark block w-full h-full sm:rounded-xl select-none ${
-                    isCurrent 
-                      ? 'border border-white/5 hover:shadow-2xl hover:-translate-y-1 hover:border-white/10 cursor-pointer' 
-                      : 'border border-white/5 hover:shadow-2xl hover:-translate-y-1 hover:border-white/10 cursor-pointer'
-                  }`}
-                >
-                  <div className="absolute inset-0 bg-[#0a192f] z-0">
-                    <Image
-                      src={company.backgroundImage}
-                      alt="Background"
-                      fill
-                      className={`object-cover transition-all duration-1000 ease-out ${
-                        isCurrent 
-                          ? 'opacity-30 grayscale-0 scale-105' 
-                          : 'opacity-40 grayscale-[50%] group-hover:opacity-30 group-hover:grayscale-0 group-hover:scale-110'
-                      }`}
-                      sizes="(max-width: 768px) 100vw, 33vw"
-                    />
-                  </div>
+            const CardContent = (
+              <>
+                <div className="absolute inset-0 bg-[#0a192f] z-0">
+                  <Image
+                    src={company.backgroundImage}
+                    alt="Background"
+                    fill
+                    className={`object-cover transition-all duration-1000 ease-out ${
+                      isCurrent 
+                        ? 'opacity-30 grayscale-0 scale-105' 
+                        : 'opacity-40 grayscale-[50%] group-hover:opacity-30 group-hover:grayscale-0 group-hover:scale-110'
+                    }`}
+                    sizes="(max-width: 768px) 100vw, 33vw"
+                  />
+                </div>
                   
                   {/* Heavy dark gradient overlay to make logos pop */}
                   <div className={`absolute inset-0 z-0 transition-colors duration-700 mix-blend-multiply ${
@@ -234,8 +222,37 @@ export function SubCompanyTiles(props: SubCompanyTilesProps) {
                       </div>
                     </div>
                   )}
-                  
-                </CardWrapper>
+                
+                </>
+            );
+
+            const sharedClass = `group relative overflow-hidden aspect-[4/3] flex flex-col justify-center items-center shadow-xl transition-all duration-500 bg-neutral-dark block w-full h-full sm:rounded-xl select-none ${
+              isCurrent 
+                ? 'border border-white/5 hover:shadow-2xl hover:-translate-y-1 hover:border-white/10 cursor-pointer' 
+                : 'border border-white/5 hover:shadow-2xl hover:-translate-y-1 hover:border-white/10 cursor-pointer'
+            }`;
+
+            return (
+              <motion.div 
+                key={index}
+                variants={itemVariants}
+                className="h-full"
+              >
+                {hasUrl ? (
+                  isExternal ? (
+                    <a href={company.url} target="_blank" rel="noopener noreferrer" className={sharedClass}>
+                      {CardContent}
+                    </a>
+                  ) : (
+                    <Link href={company.url as string} className={sharedClass}>
+                      {CardContent}
+                    </Link>
+                  )
+                ) : (
+                  <div className={sharedClass}>
+                    {CardContent}
+                  </div>
+                )}
               </motion.div>
             );
           })}
diff --git a/lib/standorte-data.ts b/lib/standorte-data.ts
index a346f8168..f964de7fc 100644
--- a/lib/standorte-data.ts
+++ b/lib/standorte-data.ts
@@ -160,3 +160,15 @@ export const standorteData: StandortData[] = [
 export function getStandortById(id: string): StandortData | undefined {
   return standorteData.find(s => s.id === id);
 }
+
+// Convert StandortData to the Location format required by the map
+export const standorteLocations = standorteData.map((standort) => ({
+  id: standort.id,
+  name: standort.shortName,
+  type: standort.type,
+  x: standort.id === 'kirchheilingen' ? 52 : standort.id === 'buelstedt' ? 37 : 85,
+  y: standort.id === 'kirchheilingen' ? 55 : standort.id === 'buelstedt' ? 25.33 : 41.1,
+  description: standort.name,
+  href: `/standorte/${standort.id}`,
+  details: standort.keyFeatures.de.slice(0, 3)
+}));