diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 899bdbad32e0fe174b48d294f537b6f39a462cfd..bf17c7098b114e498b87600be1cb292ab1237976 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,9 +17,31 @@ variables:
   CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-julialib/testenv:latest
 
 stages:
+  - code-style
   - test
   - deploy
 
+# Only check style for Julia 1.6 since support for 1.0 may be dropped anyway
+code-style:
+  image: julia:1.6
+  tags: [ docker ]
+  script:
+    # install JuliaFormatter
+    - julia  -e 'using Pkg; Pkg.add(PackageSpec(name="JuliaFormatter"))'
+    # try and format the files
+    - julia  -e 'using JuliaFormatter; format(".", verbose=true)'
+    # check the git diff for possible changes due to the formatting
+    - julia -e '
+      out = Cmd(`git diff --name-only`) |> read |> String
+      if out == ""
+          exit(0)
+      else
+          @error "Some files have not been formatted !!!"
+          write(stdout, out)
+          exit(1)
+      end'
+
+
 # Name a test and select an appropriate image.
 # images comes from Docker hub
 test:1.0:
diff --git a/docs/make.jl b/docs/make.jl
index bfd62893e9e67c339b8f0dadefc62914d25ac42c..836b38bf8d968ebc4fdb3007d3782f3d558729d6 100644
--- a/docs/make.jl
+++ b/docs/make.jl
@@ -1,3 +1,5 @@
 using Documenter, CaosDB
 
-makedocs(modules = [CaosDB], sitename = "CaosDB.jl Documentation")
+makedocs(
+    modules=[CaosDB],
+    sitename="CaosDB.jl Documentation")