diff --git a/views/frontend/content/discussion.blade.php b/views/frontend/content/discussion.blade.php
index e9e4ebe13..51a2c9c0c 100644
--- a/views/frontend/content/discussion.blade.php
+++ b/views/frontend/content/discussion.blade.php
@@ -4,7 +4,7 @@
     <div>
         @foreach ($posts as $post)
             <div>
-                <?php $user = ! empty($post->relationships->user->data) ? $getResource($post->relationships->user->data) : null; ?>
+                @php $user = ! empty($post->relationships->user->data) ? $getResource($post->relationships->user->data) : null; @endphp
                 <h3>{{ $user ? $user->attributes->displayName : $translator->trans('core.lib.username.deleted_text') }}</h3>
                 <div class="Post-body">
                     {!! $post->attributes->contentHtml !!}
diff --git a/views/layouts/basic.blade.php b/views/layouts/basic.blade.php
index 8e7978ec0..0054dc377 100644
--- a/views/layouts/basic.blade.php
+++ b/views/layouts/basic.blade.php
@@ -1,9 +1,8 @@
-{{-- TODO: Change below to @php when Laravel is upgraded --}}
-<?php
+@php
   $primaryColor = $settings->get('theme_primary_color', '#000');
-?>
+@endphp
 
-<!doctype html>
+<!DOCTYPE html>
 <html>
   <head>
     <meta charset="utf-8">
