diff --git a/.gitignore b/.gitignore
index 2521d2d87bf22c5042012f1bb838bc4769ccc49c..1412f3b8b77cfb067d6cc3bdbcdfeaa6465e817c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,25 @@
+/Tst/log_viewer/Makefile
+/Tst/log_viewer/Makefile.in
+/Tst/log_viewer/aclocal.m4
+/Tst/log_viewer/autom4te.cache/
+/Tst/log_viewer/config.status
+/Tst/log_viewer/configure
+/Tst/log_viewer/install-sh
+/Tst/log_viewer/log_viewer.desktop
+/Tst/log_viewer/missing
+/Tst/tst/Makefile
+/Tst/tst/Makefile.in
+/Tst/tst/aclocal.m4
+/Tst/tst/autom4te.cache/
+/Tst/tst/config.status
+/Tst/tst/configure
+/Tst/tst/install-sh
+/Tst/tst/missing
+/Tst/tst/tst.desktop
+
 ### Example user template
+!.gitkeep
+
 # IntelliJ project files
 .idea
 
@@ -142,3 +163,4 @@ dmypy.json
 # Cython debug symbols
 cython_debug/
 
+/Tst/confignator/doc/source/_apidocfiles/
diff --git a/Ccs/ccs_main_config.cfg b/Ccs/ccs_main_config.cfg
index a03d9ce61564869a0349672629346678bea074a6..522db3ec2690bb8c6bc45c2237f52c7d866e9292 100644
--- a/Ccs/ccs_main_config.cfg
+++ b/Ccs/ccs_main_config.cfg
@@ -12,7 +12,7 @@ font_size = 10
 scrollback_lines = 1000
 
 [ccs-logging]
-log-dir = ${paths:obsw}/logs
+log-dir = ${paths:base}/logs
 level = INFO
 max_logs = 30
 
diff --git a/Tst/log_viewer/log_viewer.cfg b/Tst/log_viewer/log_viewer.cfg
index 0347de80ea6dacc6295b97c514b6a84b076a2e39..97b978c471bfceb4c90dc8a5d608884815b5bc7b 100644
--- a/Tst/log_viewer/log_viewer.cfg
+++ b/Tst/log_viewer/log_viewer.cfg
@@ -27,5 +27,5 @@ thread = False
 threadname = False
 
 [log-viewer-history]
-last-folder = /home/swiii/OBSW/implementation/logs/tst/data_model
+last-folder = ${logging:log-dir}/tst/data_model
 
diff --git a/Tst/tst/tst.cfg b/Tst/tst/tst.cfg
index 64e00cef61bb52ff52a7a9ccd8d3b976ebdf396e..f8f1ef44d2c2ac12707216588c7f1a21f64ffa16 100644
--- a/Tst/tst/tst.cfg
+++ b/Tst/tst/tst.cfg
@@ -18,5 +18,5 @@ paned-position = 960
 paned-position-codeblockreuse = 520
 
 [tst-history]
-last-folder = /home/swiii/OBSW/implementation/Tst/test_specs
+last-folder = ${paths:tst}/test_specs
 
diff --git a/logs/.gitkeep b/logs/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391