diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ed46acccf9..d68fe0a59b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,27 +6,47 @@ labels: bug
 assignees: markphelps
 ---
 
-**Describe the bug**
+### Describe the Bug
 
+<!--
 A clear and concise description of what the bug is.
+-->
 
-**Version Info**
+### Version Info
 
-Run `flipt --version` and paste the output here.
+Run `flipt --version` and paste the output here:
 
-**To Reproduce**
+### To Reproduce
 
+<!--
 Steps to reproduce the behavior.
+-->
 
-**Expected behavior**
+### Expected Behavior
 
+<!--
 A clear and concise description of what you expected to happen.
+-->
+
+### Additional Context
+
+Add any other context about the problem here.
+
+Examples:
+
+- OS
+- Config file used
+- Database used (SQLite, MySQL, or Postgres)
+- Screenshots
+- Exported data from the database
+
+<!--
 
 **Screenshots**
 
 If applicable, add screenshots to help explain your problem.
 
-**Attach an export**
+**Attach an Export**
 
 If the bug could be best shown with a specific set of data, please export your data by running:
 
@@ -36,12 +56,4 @@ flipt export > export.yml
 
 And then attach the YAML file to this issue. ❤️
 
-**Additional context**
-
-Add any other context about the problem here.
-
-Examples:
-
-- OS
-- Config file used
-- Database used (SQLite, MySQL, or Postgres)
+-->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index dde6c72333..823f1ee01c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -6,15 +6,38 @@ labels: enhancement
 assignees: markphelps
 ---
 
-**Is your feature request related to a problem? Please describe.**
+### Problem
 
+Is your feature request related to a problem? Please describe:
+
+<!--
 A clear and concise description of what the problem is. Ex. I'm frustrated by [...]
+-->
+
+### Ideal Solution
 
-**Describe the solution you'd like**
+Describe the solution you'd like:
 
+<!--
 A clear and concise description of what you want to happen.
+-->
+
+### Additional Context
+
+Add any other context about the feature request here.
+
+Examples:
 
-**Attach an export**
+- Screenshots
+- Exported data from the database
+
+<!--
+
+**Screenshots**
+
+If applicable, add screenshots to help explain your request.
+
+**Attach an Export**
 
 If your feature request is based on a limitation that could be best shown with a specific set of data, please export your data by running:
 
@@ -24,6 +47,4 @@ flipt export > export.yml
 
 And then attach the YAML file to this issue. ❤️
 
-**Additional context**
-
-Add any other context or screenshots about the feature request here.
+-->
\ No newline at end of file
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 621e326edb..749513d65d 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -53,19 +53,12 @@ jobs:
 
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.17.x"
+          go-version: "1.17"
+          check-latest: true
+          cache: true
 
       - uses: actions/checkout@v3
 
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
       - name: Benchmark (SQLite)
         run: go test -bench=. ./... -run=XXX -v
 
diff --git a/.github/workflows/database-test.yml b/.github/workflows/database-test.yml
index de515cc69d..07b45a1e33 100644
--- a/.github/workflows/database-test.yml
+++ b/.github/workflows/database-test.yml
@@ -31,8 +31,11 @@ jobs:
         ports:
           # will assign a random free host port
           - 5432/tcp
-        # needed because the postgres container does not provide a healthcheck
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
         env:
           POSTGRES_DB: flipt_test
           POSTGRES_USER: postgres
@@ -43,16 +46,9 @@ jobs:
 
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.17.x"
-
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          go-version: "1.17"
+          check-latest: true
+          cache: true
 
       - name: Unit Test (Postgres)
         run: DB_URL="postgres://postgres:password@localhost:${{ job.services.postgres.ports['5432'] }}/flipt_test?sslmode=disable" go test -count=1 -v ./...
@@ -79,22 +75,9 @@ jobs:
 
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.17.x"
-
-      - id: go-cache-paths
-        run: |
-          echo "::set-output name=go-build::$(go env GOCACHE)"
-          echo "::set-output name=go-mod::$(go env GOMODCACHE)"
-
-      - uses: actions/cache@v3
-        with:
-          path: ${{ steps.go-cache-paths.outputs.go-build }}
-          key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}
-
-      - uses: actions/cache@v3
-        with:
-          path: ${{ steps.go-cache-paths.outputs.go-mod }}
-          key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
+          go-version: "1.17"
+          check-latest: true
+          cache: true
 
       - name: Unit Test (MySQL)
         run: DB_URL="mysql://mysql:password@localhost:${{ job.services.mysql.ports['3306'] }}/flipt_test" go test -count=1 -v ./...
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4c9b78105c..30dd575048 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,19 +19,12 @@ jobs:
 
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.17.x"
+          go-version: "1.17"
+          check-latest: true
+          cache: true
 
       - uses: arduino/setup-task@v1
 
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
       - name: Install Syft
         run: |
           curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index a951c4014d..bc8cc0e55f 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -12,19 +12,12 @@ jobs:
 
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.17.x"
+          go-version: "1.17"
+          check-latest: true
+          cache: true
 
       - uses: arduino/setup-task@v1
 
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
       - name: Install Syft
         run: |
           curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df9bcb9c8a..4f6d53ebcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Build date was incorrect and always showed current date/time
+- Button spacing issue on targeting page
+- Docker compose examples run again after switch to non-root user 
 
 ## [v1.9.0](https://github.com/markphelps/flipt/releases/tag/v1.9.0) - 2022-07-06
 
diff --git a/examples/mysql/Dockerfile b/examples/mysql/Dockerfile
index 02d539c9e5..9945c94957 100644
--- a/examples/mysql/Dockerfile
+++ b/examples/mysql/Dockerfile
@@ -1,5 +1,7 @@
 FROM flipt/flipt:latest
 
+USER root
+
 RUN apk update && apk add --no-cache git bash
 
 RUN git clone https://github.com/vishnubob/wait-for-it.git /tmp && \
diff --git a/examples/postgres/Dockerfile b/examples/postgres/Dockerfile
index 02d539c9e5..9945c94957 100644
--- a/examples/postgres/Dockerfile
+++ b/examples/postgres/Dockerfile
@@ -1,5 +1,7 @@
 FROM flipt/flipt:latest
 
+USER root
+
 RUN apk update && apk add --no-cache git bash
 
 RUN git clone https://github.com/vishnubob/wait-for-it.git /tmp && \
diff --git a/examples/prometheus/docker-compose.yml b/examples/prometheus/docker-compose.yml
index a824e7051d..ad46d771b5 100644
--- a/examples/prometheus/docker-compose.yml
+++ b/examples/prometheus/docker-compose.yml
@@ -20,9 +20,9 @@ services:
       - flipt_network
     environment:
       - "FLIPT_LOG_LEVEL=debug"
-      - "FLIPT_CACHE_MEMORY_ENABLED=true"
-      - "FLIPT_CACHE_MEMORY_EXPIRATION=1m"
-      - "FLIPT_CACHE_MEMORY_EVICTION_INTERVAL=2m"
+      - "FLIPT_CACHE_ENABLED=true"
+      - "FLIPT_CACHE_BACKEND=memory"
+      - "FLIPT_CACHE_TTL=1m"
 
 networks:
   flipt_network:
diff --git a/ui/src/components/Flags/DebugConsole.vue b/ui/src/components/Flags/DebugConsole.vue
index 11f031664f..a22ad5fa07 100644
--- a/ui/src/components/Flags/DebugConsole.vue
+++ b/ui/src/components/Flags/DebugConsole.vue
@@ -23,11 +23,13 @@
         />
       </div>
     </div>
-    <div class="field">
-      <div class="control is-grouped">
+    <div class="field is-grouped">
+      <div class="control">
         <button class="button is-primary" @click.prevent="evaluate()">
           Debug
         </button>
+      </div>
+      <div class="control">
         <button class="button" @click.prevent="reset()">Reset</button>
       </div>
     </div>
diff --git a/ui/src/components/Flags/Targeting.vue b/ui/src/components/Flags/Targeting.vue
index a29c76d9c4..4c183a38cd 100644
--- a/ui/src/components/Flags/Targeting.vue
+++ b/ui/src/components/Flags/Targeting.vue
@@ -49,6 +49,8 @@
           >
             New Rule
           </button>
+        </div>
+        <div class="control">
           <button
             class="button"
             :disabled="!reordered"