diff --git a/files/gitlab-cookbooks/gitlab/libraries/gitlab_pages.rb b/files/gitlab-cookbooks/gitlab/libraries/gitlab_pages.rb
index 28246bc5c9cf8455df6affd07a36d707b97656e5_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvbGlicmFyaWVzL2dpdGxhYl9wYWdlcy5yYg==..fab310d300fc84c1d5ab27a58cd30d8ef12ea9dd_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvbGlicmFyaWVzL2dpdGxhYl9wYWdlcy5yYg== 100644
--- a/files/gitlab-cookbooks/gitlab/libraries/gitlab_pages.rb
+++ b/files/gitlab-cookbooks/gitlab/libraries/gitlab_pages.rb
@@ -91,7 +91,7 @@
 
       o = query_gitlab_rails(redirect_uri, app_name)
       if o.exitstatus.zero?
-        app_id, app_secret = o.stdout.chomp.split(" ")
+        app_id, app_secret = o.stdout.lines.last.chomp.split(" ")
 
         Gitlab['gitlab_pages']['gitlab_secret'] = app_secret
         Gitlab['gitlab_pages']['gitlab_id'] = app_id
diff --git a/files/gitlab-cookbooks/gitlab/libraries/helpers/grafana_helper.rb b/files/gitlab-cookbooks/gitlab/libraries/helpers/grafana_helper.rb
index 28246bc5c9cf8455df6affd07a36d707b97656e5_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvbGlicmFyaWVzL2hlbHBlcnMvZ3JhZmFuYV9oZWxwZXIucmI=..fab310d300fc84c1d5ab27a58cd30d8ef12ea9dd_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvbGlicmFyaWVzL2hlbHBlcnMvZ3JhZmFuYV9oZWxwZXIucmI= 100644
--- a/files/gitlab-cookbooks/gitlab/libraries/helpers/grafana_helper.rb
+++ b/files/gitlab-cookbooks/gitlab/libraries/helpers/grafana_helper.rb
@@ -12,7 +12,7 @@
     o = query_gitlab_rails(redirect_uri, app_name)
 
     if o.exitstatus.zero?
-      app_id, app_secret = o.stdout.chomp.split(" ")
+      app_id, app_secret = o.stdout.lines.last.chomp.split(" ")
 
       Gitlab['grafana']['gitlab_secret'] = app_secret
       Gitlab['grafana']['gitlab_application_id'] = app_id
diff --git a/files/gitlab-cookbooks/mattermost/libraries/mattermost_helper.rb b/files/gitlab-cookbooks/mattermost/libraries/mattermost_helper.rb
index 28246bc5c9cf8455df6affd07a36d707b97656e5_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9tYXR0ZXJtb3N0L2xpYnJhcmllcy9tYXR0ZXJtb3N0X2hlbHBlci5yYg==..fab310d300fc84c1d5ab27a58cd30d8ef12ea9dd_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9tYXR0ZXJtb3N0L2xpYnJhcmllcy9tYXR0ZXJtb3N0X2hlbHBlci5yYg== 100644
--- a/files/gitlab-cookbooks/mattermost/libraries/mattermost_helper.rb
+++ b/files/gitlab-cookbooks/mattermost/libraries/mattermost_helper.rb
@@ -12,7 +12,7 @@
     o = query_gitlab_rails(redirect_uri, app_name)
 
     if o.exitstatus.zero?
-      app_id, app_secret = o.stdout.chomp.split(" ")
+      app_id, app_secret = o.stdout.lines.last.chomp.split(" ")
 
       Gitlab['mattermost']['gitlab_enable'] = true
       Gitlab['mattermost']['gitlab_secret'] = app_secret