diff --git a/composer.json b/composer.json
index fbb6efab..e305ff44 100644
--- a/composer.json
+++ b/composer.json
@@ -67,7 +67,7 @@
     "fluidtypo3/vhs": "^4.3",
     "webdevops/metaseo": "3.0.0",
     "helhum/typo3-console": "^4.9",
-    "gridelementsteam/gridelements": "^8.2",
+    "gridelementsteam/gridelements": "dev-8-0",
     "friendsoftypo3/form-legacy": "^8.7"
   },
   "scripts": {
diff --git a/composer.lock b/composer.lock
index 3c0788ea..95a14e5a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "40ae079267d366554fc334aff3dd5506",
+    "content-hash": "335df7e49844efefe2fc55d9eefccdd5",
     "packages": [
         {
             "name": "christophlehmann/imageoptimizer",
@@ -852,14 +852,22 @@
         },
         {
             "name": "gridelementsteam/gridelements",
-            "version": "8.2.3",
+            "version": "dev-8-0",
             "source": {
                 "type": "git",
                 "url": "https://git.typo3.org/TYPO3CMS/Extensions/gridelements.git",
-                "reference": "fc617c5e2359613afec7a881ca93fcff53a1c545"
+                "reference": "85a24021c223c364661fc0dbafc915c0a66a722c"
             },
             "require": {
-                "typo3/cms-core": ">=8.7.0,<9.0"
+                "typo3/cms-backend": "^8.7",
+                "typo3/cms-core": "^8.7",
+                "typo3/cms-frontend": "^8.7",
+                "typo3/cms-lang": "^8.7",
+                "typo3/cms-recordlist": "^8.7"
+            },
+            "conflict": {
+                "jfmulticontent": "*",
+                "templavoila": "*"
             },
             "replace": {
                 "gridelements": "self.version",
@@ -882,7 +890,7 @@
                 "TYPO3 CMS",
                 "grids"
             ],
-            "time": "2018-06-18T18:23:18+00:00"
+            "time": "2018-08-13T09:09:57+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
@@ -2708,7 +2716,6 @@
                 }
             ],
             "description": "Compress/minify your HTML output",
-            "homepage": "https://extensions.typo3.org/extension/html_compress/",
             "time": "2016-12-26T10:19:02+00:00"
         },
         {
@@ -2745,7 +2752,6 @@
                 }
             ],
             "description": "Media management system for TYPO3 CMS.",
-            "homepage": "https://extensions.typo3.org/extension/media/",
             "time": "2017-11-02T13:08:04+00:00"
         },
         {
@@ -2785,7 +2791,6 @@
                 }
             ],
             "description": "Simply manage (permanent 301) redirects in the list view. The extension supports multidomain sites, count the redirect usage and shows the last referer. UPDATE! imports the records from realurl.",
-            "homepage": "https://extensions.typo3.org/extension/ods_redirects/",
             "time": "2017-05-22T22:07:45+00:00"
         },
         {
@@ -2822,7 +2827,6 @@
                     "username": "plusb"
                 }
             ],
-            "homepage": "https://extensions.typo3.org/extension/pb_social/",
             "time": "2018-02-14T11:05:37+00:00"
         },
         {
@@ -2856,7 +2860,6 @@
                 }
             ],
             "description": "Optimization of the final page: reformatting the (x)html output, removal of new lines, and quotes. Move development repository to https://github.com/lochmueller/sourceopt",
-            "homepage": "https://extensions.typo3.org/extension/sourceopt/",
             "time": "2017-06-15T17:25:53+00:00"
         },
         {
@@ -3715,7 +3718,9 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "gridelementsteam/gridelements": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {