diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cade3272f..ea5db7a07 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,19 +19,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: ["1.18.x"]
+        go-version: ["1.22.x"]
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 2
       - name: terraform fmt
         run: |
           make tflint
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
           version: v1.48.0
           go-version: ${{ matrix.go-version }}
@@ -42,9 +42,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - {os: ubuntu-latest, go: 1.18}
-          - {os: windows-latest, go: 1.18}
-          - {os: macos-latest, go: 1.18}
+          - {os: ubuntu-latest, go: 1.22}
+          - {os: windows-latest, go: 1.22}
+          - {os: macos-latest, go: 1.22}
     timeout-minutes: 10
     steps:
       - name: Set up Go
@@ -55,10 +55,25 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
       - name: Setup terraform
-        uses: hashicorp/setup-terraform@v1
+        uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_wrapper: false
+      - name: Enable KVM group perms
+        run: |
+             echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+             sudo udevadm control --reload-rules
+             sudo udevadm trigger --name-match=kvm
+        if: runner.os == 'Linux'
       - name: Build
         run: |
           make
+      - name: Setup libvirt (Linux)
+        run: |
+             sudo apt-get -y install qemu-kvm libvirt-daemon-system
+             sudo adduser $USER libvirt
+             sudo systemctl start libvirtd
+             sudo virsh -c qemu:///system list --all
+        if: runner.os == 'Linux'
       - name: Test pre-requisites (Linux)
         run: sudo apt-get -y install xsltproc
         if: runner.os == 'Linux'
@@ -71,6 +86,11 @@ jobs:
       - name: Test
         run: |
           make test
+        if: runner.os == 'Windows' || runner.os == 'MacOS'
+      - name: Test
+        run: |
+          make testacc
+        if: runner.os == 'Linux'
       - uses: actions/upload-artifact@v2
         with:
           name: terraform-provider-libvirt-${{ matrix.os }}
diff --git a/website/.bundle/config b/website/.bundle/config
new file mode 100644
index 000000000..ba922fd08
--- /dev/null
+++ b/website/.bundle/config
@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor"
diff --git a/website/Gemfile b/website/Gemfile
new file mode 100644
index 000000000..5eeb0b855
--- /dev/null
+++ b/website/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'middleman'
diff --git a/website/Gemfile.lock b/website/Gemfile.lock
new file mode 100644
index 000000000..ba63ad072
--- /dev/null
+++ b/website/Gemfile.lock
@@ -0,0 +1,100 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.0.7.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    backports (3.15.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.1.5)
+    contracts (0.13.0)
+    dotenv (2.7.5)
+    erubis (2.7.0)
+    execjs (2.7.0)
+    fast_blank (1.0.0)
+    fastimage (2.1.7)
+    ffi (1.11.1)
+    haml (5.1.2)
+      temple (>= 0.8.0)
+      tilt
+    hamster (3.0.0)
+      concurrent-ruby (~> 1.0)
+    hashie (3.6.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    kramdown (1.17.0)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    memoist (0.16.0)
+    middleman (4.3.5)
+      coffee-script (~> 2.2)
+      haml (>= 4.0.5)
+      kramdown (~> 1.2)
+      middleman-cli (= 4.3.5)
+      middleman-core (= 4.3.5)
+    middleman-cli (4.3.5)
+      thor (>= 0.17.0, < 2.0)
+    middleman-core (4.3.5)
+      activesupport (>= 4.2, < 5.1)
+      addressable (~> 2.3)
+      backports (~> 3.6)
+      bundler
+      contracts (~> 0.13.0)
+      dotenv
+      erubis
+      execjs (~> 2.0)
+      fast_blank
+      fastimage (~> 2.0)
+      hamster (~> 3.0)
+      hashie (~> 3.4)
+      i18n (~> 0.9.0)
+      listen (~> 3.0.0)
+      memoist (~> 0.14)
+      padrino-helpers (~> 0.13.0)
+      parallel
+      rack (>= 1.4.5, < 3)
+      sassc (~> 2.0)
+      servolux
+      tilt (~> 2.0.9)
+      uglifier (~> 3.0)
+    minitest (5.12.2)
+    padrino-helpers (0.13.3.4)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.13.3.4)
+      tilt (>= 1.4.1, < 3)
+    padrino-support (0.13.3.4)
+      activesupport (>= 3.1)
+    parallel (1.18.0)
+    public_suffix (4.0.1)
+    rack (2.0.7)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    sassc (2.2.1)
+      ffi (~> 1.9)
+    servolux (0.13.0)
+    temple (0.8.2)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uglifier (3.2.0)
+      execjs (>= 0.3.0, < 3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  middleman
+
+BUNDLED WITH
+   1.17.2
diff --git a/website/config.rb b/website/config.rb
new file mode 100644
index 000000000..e69de29bb