diff --git a/.asf.yaml b/.asf.yaml
index 68bab32..42f7c91 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -32,8 +32,8 @@ github:
     #
     # set up branch protection for site publishing branch to avoid accidental deletion
     # force-pushes are still necessary as they are used to deploy new versions of the site
-    publish:
-      allow_force_pushes: true
+    #publish:
+    #  allow_force_pushes: true
 
 notifications:
   commits:      notifications@db.apache.org
diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml
index 3559139..91a18e0 100644
--- a/.github/workflows/build-site.yml
+++ b/.github/workflows/build-site.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
diff --git a/.github/workflows/deploy-site.yml b/.github/workflows/deploy-site.yml
index d854066..ed67e29 100644
--- a/.github/workflows/deploy-site.yml
+++ b/.github/workflows/deploy-site.yml
@@ -18,8 +18,9 @@ on:
     paths:
       - 'src/main/asciidoc/**'
       - 'src/main/template/**'
+      - 'src/main/resources/**'
       - '.asf.yaml.publish'
-      - '.htaccess'
+      - 'pom.xml'
 
 
 jobs:
@@ -36,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
@@ -52,7 +53,7 @@ jobs:
         id: short-sha
         run: |
           short_sha=$(git rev-parse --short=10 $GITHUB_SHA)
-          echo "::set-output name=SHORT_SHA::$short_sha"
+          echo "SHORT_SHA=$short_sha" >> "$GITHUB_OUTPUT"
 
 
       # Determines the author data of the HEAD commit
@@ -66,8 +67,8 @@ jobs:
           author_email=$(git log -1 --format='%aE' HEAD)
 
           echo "Setting up author data to use for deploy commit"
-          git config --local user.name $author_name
-          git config --local user.email $author_email
+          git config --local user.name "$author_name"
+          git config --local user.email "$author_email"
 
 
       # Adds additional configuration files that are supposed to be included in the page deploy to the build directory
@@ -77,8 +78,6 @@ jobs:
         if: success()
         run: |
           cp -v .asf.yaml.publish target/site/.asf.yaml
-          cp -v .htaccess target/site/
-
 
       - name: Check Out Site Branch
         if: success()
@@ -105,7 +104,6 @@ jobs:
         if: success()
         run: |
           mv -v target/site/.asf.yaml ./
-          mv -v target/site/.htaccess ./
 
 
       # Moves the new site resources from the build directory to the content directory
@@ -113,7 +111,7 @@ jobs:
         if: success()
         run: |
           mkdir -v content
-          mv -v target/site/* content/
+          mv -v target/site/* ./
 
           # Explicitly removes build dir
           # This checks whether there are any remaining resources that were not moved to the correct location
@@ -152,7 +150,7 @@ jobs:
               has_staged_changes=true
           fi
 
-          echo "::set-output name=HAS_STAGED_CHANGES::$has_staged_changes"
+          echo "HAS_STAGED_CHANGES=$has_staged_changes" >> "$GITHUB_OUTPUT"
 
 
       # Publishes the build results
diff --git a/.github/workflows/recreate-site-branch.yml b/.github/workflows/recreate-site-branch.yml
index 8670039..d3913c4 100644
--- a/.github/workflows/recreate-site-branch.yml
+++ b/.github/workflows/recreate-site-branch.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: main
           fetch-depth: 1
@@ -43,7 +43,7 @@ jobs:
         id: short-sha
         run: |
           short_sha=$(git rev-parse --short=10 $GITHUB_SHA)
-          echo "::set-output name=SHORT_SHA::$short_sha"
+          echo "SHORT_SHA=$short_sha" >> "$GITHUB_OUTPUT"
 
 
       # Determines the author data of the HEAD commit
@@ -57,8 +57,8 @@ jobs:
           author_email=$(git log -1 --format='%aE' HEAD)
 
           echo "Setting up author data to use for deploy commit"
-          git config --local user.name $author_name
-          git config --local user.email $author_email
+          git config --local user.name "$author_name"
+          git config --local user.email "$author_email"
 
 
       # Creates and checks out a new orphan branch used to publish the site
@@ -76,7 +76,7 @@ jobs:
           git reset
           rm .gitignore
           git add target/site
-          git add .asf.yaml.publish .htaccess
+          git add .asf.yaml.publish
           git clean -df
 
 
@@ -84,8 +84,7 @@ jobs:
       - name: Move Content and Site Configuration
         if: success()
         run: |
-          mkdir -v content
-          git mv -v target/site/* content/
+          git mv -v target/site/* ./
           git mv -v .asf.yaml.publish .asf.yaml
 
 
diff --git a/.htaccess b/.htaccess
deleted file mode 100644
index 8f1d4fc..0000000
--- a/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-RewriteEngine On
-RewriteBase /
-RewriteRule ^(?!content/)(.*)$ content/$1
diff --git a/pom.xml b/pom.xml
index 1e08264..b94ea8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>23</version>
+        <version>26</version>
     </parent>
     
     <groupId>org.apache.db</groupId>
@@ -47,7 +47,7 @@ This repository contains the sources for the Apache DB website</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <asciidoctor.maven.plugin.version>2.1.0</asciidoctor.maven.plugin.version>
+        <asciidoctor.maven.plugin.version>3.1.1</asciidoctor.maven.plugin.version>
         <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
         <build.dir>${project.basedir}/target/site</build.dir>
     </properties>
@@ -113,13 +113,6 @@ This repository contains the sources for the Apache DB website</description>
             </activation>
             <build>
                 <plugins>
-                    <plugin>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <configuration>
-                            <source>1.8</source>
-                            <target>1.8</target>
-                        </configuration>
-                    </plugin>
                     <plugin>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctor-maven-plugin</artifactId>