diff --git a/1_Install.ps1 b/1_Install.ps1
index c67f127..f1154f9 100644
--- a/1_Install.ps1
+++ b/1_Install.ps1
@@ -67,13 +67,27 @@ function Update-Scripts {
                 Write-Host "Extracting update package..." -ForegroundColor Cyan
                 Expand-Archive -Path $zipPath -DestinationPath $tempDir -Force
                 
-                # Find the extracted directory
+                # Find the extracted directory - usually named like "windows-install-master"
                 $extractedDir = Get-ChildItem -Path $tempDir -Directory | Select-Object -First 1
                 
                 if (($extractedDir) -and ((Test-Path $extractedDir.FullName))) {
                     # Copy all files except .git directory to current location
                     Write-Host "Installing updates..." -ForegroundColor Cyan
-                    Get-ChildItem -Path $extractedDir.FullName | Where-Object { $_.Name -ne ".git" } | ForEach-Object {
+                    
+                    # Check if there's another level of directory inside (repo-in-repo issue)
+                    $subDirs = Get-ChildItem -Path $extractedDir.FullName -Directory
+                    $foundNestedRepo = $false
+                    
+                    if ($subDirs.Count -eq 1 -and $subDirs[0].Name -like "*windows-install*") {
+                        Write-Host "Detected nested repository structure, using correct source directory..." -ForegroundColor Yellow
+                        $sourceDir = $subDirs[0].FullName
+                        $foundNestedRepo = $true
+                    } else {
+                        $sourceDir = $extractedDir.FullName
+                    }
+                    
+                    # Copy files from the correct source directory
+                    Get-ChildItem -Path $sourceDir | Where-Object { $_.Name -ne ".git" } | ForEach-Object {
                         $destPath = Join-Path -Path $updateScriptDir -ChildPath $_.Name
                         Copy-Item -Path $_.FullName -Destination $destPath -Recurse -Force
                     }
diff --git a/2_ConfigUpdate.ps1 b/2_ConfigUpdate.ps1
index 946843b..8a30188 100644
--- a/2_ConfigUpdate.ps1
+++ b/2_ConfigUpdate.ps1
@@ -67,13 +67,27 @@ function Update-Scripts {
                 Write-Host "Extracting update package..." -ForegroundColor Cyan
                 Expand-Archive -Path $zipPath -DestinationPath $tempDir -Force
                 
-                # Find the extracted directory
+                # Find the extracted directory - usually named like "windows-install-master"
                 $extractedDir = Get-ChildItem -Path $tempDir -Directory | Select-Object -First 1
                 
                 if (($extractedDir) -and ((Test-Path $extractedDir.FullName))) {
                     # Copy all files except .git directory to current location
                     Write-Host "Installing updates..." -ForegroundColor Cyan
-                    Get-ChildItem -Path $extractedDir.FullName | Where-Object { $_.Name -ne ".git" } | ForEach-Object {
+                    
+                    # Check if there's another level of directory inside (repo-in-repo issue)
+                    $subDirs = Get-ChildItem -Path $extractedDir.FullName -Directory
+                    $foundNestedRepo = $false
+                    
+                    if ($subDirs.Count -eq 1 -and $subDirs[0].Name -like "*windows-install*") {
+                        Write-Host "Detected nested repository structure, using correct source directory..." -ForegroundColor Yellow
+                        $sourceDir = $subDirs[0].FullName
+                        $foundNestedRepo = $true
+                    } else {
+                        $sourceDir = $extractedDir.FullName
+                    }
+                    
+                    # Copy files from the correct source directory
+                    Get-ChildItem -Path $sourceDir | Where-Object { $_.Name -ne ".git" } | ForEach-Object {
                         $destPath = Join-Path -Path $updateScriptDir -ChildPath $_.Name
                         Copy-Item -Path $_.FullName -Destination $destPath -Recurse -Force
                     }
diff --git a/3_ConfigAfterNextcloud.ps1 b/3_ConfigAfterNextcloud.ps1
index 3f17f31..7778094 100644
--- a/3_ConfigAfterNextcloud.ps1
+++ b/3_ConfigAfterNextcloud.ps1
@@ -67,13 +67,27 @@ function Update-Scripts {
                 Write-Host "Extracting update package..." -ForegroundColor Cyan
                 Expand-Archive -Path $zipPath -DestinationPath $tempDir -Force
                 
-                # Find the extracted directory
+                # Find the extracted directory - usually named like "windows-install-master"
                 $extractedDir = Get-ChildItem -Path $tempDir -Directory | Select-Object -First 1
                 
                 if (($extractedDir) -and ((Test-Path $extractedDir.FullName))) {
                     # Copy all files except .git directory to current location
                     Write-Host "Installing updates..." -ForegroundColor Cyan
-                    Get-ChildItem -Path $extractedDir.FullName | Where-Object { $_.Name -ne ".git" } | ForEach-Object {
+                    
+                    # Check if there's another level of directory inside (repo-in-repo issue)
+                    $subDirs = Get-ChildItem -Path $extractedDir.FullName -Directory
+                    $foundNestedRepo = $false
+                    
+                    if ($subDirs.Count -eq 1 -and $subDirs[0].Name -like "*windows-install*") {
+                        Write-Host "Detected nested repository structure, using correct source directory..." -ForegroundColor Yellow
+                        $sourceDir = $subDirs[0].FullName
+                        $foundNestedRepo = $true
+                    } else {
+                        $sourceDir = $extractedDir.FullName
+                    }
+                    
+                    # Copy files from the correct source directory
+                    Get-ChildItem -Path $sourceDir | Where-Object { $_.Name -ne ".git" } | ForEach-Object {
                         $destPath = Join-Path -Path $updateScriptDir -ChildPath $_.Name
                         Copy-Item -Path $_.FullName -Destination $destPath -Recurse -Force
                     }