diff --git a/jans-linux-setup/jans_setup/setup_app/installers/jans_lock.py b/jans-linux-setup/jans_setup/setup_app/installers/jans_lock.py
index 3e5c98cf2c9..eb9e821b63e 100644
--- a/jans-linux-setup/jans_setup/setup_app/installers/jans_lock.py
+++ b/jans-linux-setup/jans_setup/setup_app/installers/jans_lock.py
@@ -42,6 +42,7 @@ def __init__(self):
         self.config_ldif = os.path.join(self.output_dir, 'config.ldif')
         self.opa_dir = os.path.join(Config.opt_dir, 'opa')
         self.opa_bin_dir = os.path.join(self.opa_dir, 'bin')
+        self.opa_log_dir = os.path.join(self.opa_dir, 'logs')
 
     def install(self):
         if Config.get('install_jans_lock_as_server'):
@@ -97,6 +98,7 @@ def install_opa(self):
         opa_fn = 'opa'
         self.systemd_units.append(opa_fn)
         self.createDirs(self.opa_bin_dir)
+        self.createDirs(self.opa_log_dir)
         self.copyFile(self.source_files[2][0], self.opa_bin_dir)
         self.run([paths.cmd_chmod, '755', os.path.join(self.opa_bin_dir, opa_fn)])
         self.chown(self.opa_dir, Config.jetty_user, Config.jetty_group, recursive=True)
diff --git a/jans-linux-setup/jans_setup/static/system/systemd/opa.service b/jans-linux-setup/jans_setup/static/system/systemd/opa.service
index b8f3978fdc4..ce72333f53d 100644
--- a/jans-linux-setup/jans_setup/static/system/systemd/opa.service
+++ b/jans-linux-setup/jans_setup/static/system/systemd/opa.service
@@ -5,6 +5,8 @@ After=network.target
 [Service]
 Type=simple
 ExecStart=%(opa_bin_dir)s/opa run --server --addr %(jans_opa_host)s:%(jans_opa_port)s
+StandardOutput=file:%(opa_log_dir)s/stdout.log
+StandardError=file:%(opa_log_dir)s/stderr.log
 
 User=jetty
 Group=jetty