diff --git a/ansible/roles/configure/templates/configuration_README.md b/ansible/roles/configure/files/README.md
similarity index 89%
rename from ansible/roles/configure/templates/configuration_README.md
rename to ansible/roles/configure/files/README.md
index cf5a293817c433b239ca3d54f76348b815ae747d..7ca34cbbfc303d8fb9c77ff207004cb103e174e3 100644
--- a/ansible/roles/configure/templates/configuration_README.md
+++ b/ansible/roles/configure/files/README.md
@@ -1,4 +1,4 @@
-This directory contains configuration for the OpenAppStack instance running on
+This directory contains information about the OpenAppStack instance running on
 this machine. For general information, see [https://openappstack.net].
 
 ## Flux
diff --git a/ansible/roles/configure/tasks/main.yml b/ansible/roles/configure/tasks/main.yml
index 07eea015fbcdb1c6d9a4facd255c2bf290f794d9..2570f1760bf77622318992a3dccefa9c0d07d9c6 100644
--- a/ansible/roles/configure/tasks/main.yml
+++ b/ansible/roles/configure/tasks/main.yml
@@ -7,13 +7,14 @@
     state: directory
   become: true
   with_items:
-    - "{{ configuration_directory }}"
+    - "{{ data_directory }}"
     - "/usr/local/share/bash-completion/completions"
 
 - name: Create README in configuration directory
-  template:
-    src: configuration_README.md
-    dest: "{{ configuration_directory }}/README.md"
+  copy:
+    dest: "{{ data_directory }}/README.md"
+    src: README.md
+    mode: '0755'
   become: true
 
 - name: Install bash-completion
@@ -77,7 +78,7 @@
     - version
   template:
     src: "version.txt"
-    dest: "/var/lib/OpenAppStack/version.txt"
+    dest: "{{ data_directory }}/version.txt"
     mode: "0444"
   become: true
 
diff --git a/ansible/roles/pre-configure/tasks/main.yml b/ansible/roles/pre-configure/tasks/main.yml
index 4d5036284b5ef6a396b4df9a6e363c4f301996bf..787d720f162895e8f5266d8345391f0e38e27f0c 100644
--- a/ansible/roles/pre-configure/tasks/main.yml
+++ b/ansible/roles/pre-configure/tasks/main.yml
@@ -59,10 +59,6 @@
       - openshift
     executable: /usr/bin/pip3
 
-- name: Set configuration directory
-  set_fact:
-    configuration_directory: "{{ configuration_directory }}"
-
 - name: Install kubectl snap
   # kubectl needs to get installed as "classic" snap
   command: snap install --classic kubectl